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

Explicitly globalize $table_prefix in wp-settings.php in case WordPress isn't loaded in global scope. Use $_SERVER['PHP_SELF'], not $PHP_SELF. We need to keep $PHP_SELF for backwards compatibility reasons (many, many plugins rely on it). props mrtorrent, fixes #17749. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-10-18 19:37:07 +00:00
parent 1387dfd1f2
commit 97f9966f3a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/vars.php
View File

@ -16,11 +16,11 @@
if ( is_admin() ) { if ( is_admin() ) {
// wp-admin pages are checked more carefully // wp-admin pages are checked more carefully
if ( is_network_admin() ) if ( is_network_admin() )
preg_match('#/wp-admin/network/?(.*?)$#i', $PHP_SELF, $self_matches); preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
elseif ( is_user_admin() ) elseif ( is_user_admin() )
preg_match('#/wp-admin/user/?(.*?)$#i', $PHP_SELF, $self_matches); preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
else else
preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches); preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
$pagenow = $self_matches[1]; $pagenow = $self_matches[1];
$pagenow = trim($pagenow, '/'); $pagenow = trim($pagenow, '/');
$pagenow = preg_replace('#\?.*?$#', '', $pagenow); $pagenow = preg_replace('#\?.*?$#', '', $pagenow);
@ -33,7 +33,7 @@ if ( is_admin() ) {
$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried) $pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
} }
} else { } else {
if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $PHP_SELF, $self_matches) ) if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
$pagenow = strtolower($self_matches[1]); $pagenow = strtolower($self_matches[1]);
else else
$pagenow = 'index.php'; $pagenow = 'index.php';

1
wp-settings.php
View File

@ -75,6 +75,7 @@ require( ABSPATH . WPINC . '/plugin.php' );
require_wp_db(); require_wp_db();
// Set the database table prefix and the format specifiers for database table columns. // Set the database table prefix and the format specifiers for database table columns.
$GLOBALS['table_prefix'] = $table_prefix;
wp_set_wpdb_vars(); wp_set_wpdb_vars();
// Start the WordPress object cache, or an external object cache if the drop-in is present. // Start the WordPress object cache, or an external object cache if the drop-in is present.