[wp-cvs] wordpress/wp-admin upgrade-functions.php,1.85,1.86

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15255/wp-admin

Modified Files:
	upgrade-functions.php 
Log Message:
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.

Index: upgrade-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-functions.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** upgrade-functions.php	5 Jan 2005 21:57:51 -0000	1.85
--- upgrade-functions.php	15 Jan 2005 00:09:25 -0000	1.86
***************
*** 2,6 ****
  
  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() {
--- 2,5 ----
***************
*** 529,532 ****
--- 528,545 ----
  }
  
+ 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();