mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-04-05 05:04:31 +00:00
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: https://develop.svn.wordpress.org/trunk@2095 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -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 = '=';
|
||||
|
||||
Reference in New Issue
Block a user