From ade9155590306ae84917f9ab5ea6c5713cc2a309 Mon Sep 17 00:00:00 2001
From: Mike Little <mikelittle@git.wordpress.org>
Date: Wed, 9 Jul 2003 21:22:53 +0000
Subject: [PATCH] Path fix

git-svn-id: https://develop.svn.wordpress.org/trunk@251 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-config.sample.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-config.sample.php b/wp-config.sample.php
index 826956cb48..6894947860 100644
--- a/wp-config.sample.php
+++ b/wp-config.sample.php
@@ -17,7 +17,7 @@ $table_prefix             = 'wp_';   // eg 'wp_' or 'b2' or 'mylogin_'
 
 $tableposts               = $table_prefix . 'posts';
 $tableusers               = $table_prefix . 'users';
-$tablesettings            = $table_prefix . 'settings';
+$tablesettings            = $table_prefix . 'settings'; // only used during upgrade
 $tablecategories          = $table_prefix . 'categories';
 $tablecomments            = $table_prefix . 'comments';
 $tablelinks               = $table_prefix . 'links';
@@ -33,14 +33,6 @@ $b2inc = 'b2-include';
 
 /* Stop editing */
 
-// setup your own smilies (if not there is a set in b2vars)
-if (file_exists('mysmilies.php')) {
-    include('mysmilies.php');
-}
-
-// pull in the day and month translations
-require_once('day-month-trans.php');
-
 $HTTP_HOST = getenv('HTTP_HOST');  /* domain name */
 $REMOTE_ADDR = getenv('REMOTE_ADDR'); /* visitor's IP */
 $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */
@@ -51,6 +43,14 @@ $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');
+
 require_once($abspath.$b2inc.'/wp-db.php');
 require_once($abspath.$b2inc.'/b2functions.php');
 require_once($abspath.'wp-settings.php');