diff --git a/day-month-trans.php b/day-month-trans.php deleted file mode 100644 index 600dcf9220..0000000000 --- a/day-month-trans.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/mysmilies.php b/wp-config-extra.php similarity index 72% rename from mysmilies.php rename to wp-config-extra.php index b61323f60f..cb1cb0b89c 100644 --- a/mysmilies.php +++ b/wp-config-extra.php @@ -1,4 +1,30 @@ 'icon_smile.gif', @@ -47,4 +73,5 @@ $b2smiliestrans = array( ':neutral:' => 'icon_neutral.gif', ':mrgreen:' => 'icon_mrgreen.gif', ); + ?> \ No newline at end of file diff --git a/wp-config.sample.php b/wp-config.sample.php index 6894947860..a172a7fa8c 100644 --- a/wp-config.sample.php +++ b/wp-config.sample.php @@ -43,14 +43,9 @@ $passsql = DB_PASSWORD; $base = DB_NAME; $abspath = dirname(__FILE__).'/'; -// setup your own smilies (if not there is a set in b2vars) -if (file_exists($abspath.'mysmilies.php')) { - include($abspath.'mysmilies.php'); -} - -// pull in the day and month translations -require_once($abspath.'day-month-trans.php'); +// pull in the day and month translations and the smilies +require_once($abspath.'wp-config-extra.php'); require_once($abspath.$b2inc.'/wp-db.php'); require_once($abspath.$b2inc.'/b2functions.php'); require_once($abspath.'wp-settings.php');