WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
rboren 2005-01-15 00:09:25 +00:00
parent 83c5911d69
commit 1fb563136b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-admin/upgrade-functions.php
View File

@ -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";

4
wp-settings.php
View File

@ -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 = '=';