From 1fb563136b662d0fac83df097acbedbd58387b99 Mon Sep 17 00:00:00 2001
From: rboren <rboren@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 15 Jan 2005 00:09:25 +0000
Subject: [PATCH] Do not include admin-functions from ugrade-functions to avoid
 circular dependency.  Move wp-l10n higher up in the wp-settings include
 chain. Bug 627.

git-svn-id: http://svn.automattic.com/wordpress/trunk@2095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/upgrade-functions.php | 15 ++++++++++++++-
 wp-settings.php                |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 5c3b76415..d91de742a 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -1,7 +1,6 @@
 <?php
 
 require_once(dirname(__FILE__) . '/upgrade-schema.php');
-require_once(dirname(__FILE__) . '/admin-functions.php');
 // Functions to be called in install and upgrade scripts
 function upgrade_all() {
 	populate_options();
@@ -528,6 +527,20 @@ function make_db_current_silent() {
 	$alterations = dbDelta($wp_queries);
 }
 
+function get_home_path() {
+	$home = get_settings('home');
+	if ( $home != '' && $home != get_settings('siteurl') ) {
+		$home_path = parse_url($home);
+		$home_path = $home_root['path'];
+		$root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]);
+		$home_path = $root . $home_path . "/";
+	} else {
+		$home_path = ABSPATH;
+	}
+
+	return $home_path;
+}
+
 function make_site_theme_from_oldschool($theme_name, $template) {
 	$home_path = get_home_path();
 	$site_dir = ABSPATH . "wp-content/themes/$template";
diff --git a/wp-settings.php b/wp-settings.php
index 2f74a4d6c..b528465d8 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -64,6 +64,8 @@ if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') )
 	die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
 $wpdb->show_errors();
 
+require_once (ABSPATH . WPINC . '/wp-l10n.php');
+
 require (ABSPATH . WPINC . '/functions-formatting.php');
 require (ABSPATH . WPINC . '/functions-post.php');
 require (ABSPATH . WPINC . '/classes.php');
@@ -71,8 +73,6 @@ require (ABSPATH . WPINC . '/template-functions.php');
 require (ABSPATH . WPINC . '/links.php');
 require (ABSPATH . WPINC . '/kses.php');
 
-require_once (ABSPATH . WPINC . '/wp-l10n.php');
-
 if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) :
     $querystring_start = '?';
     $querystring_equal = '=';