Changeset 18993

Timestamp:

10/18/2011 07:37:07 PM (13 years ago)

Author:

nacin

Message:

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

Location:

trunk

Files:

• wp-includes/vars.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/vars.php

@@ -17 +17 @@
     // wp-admin pages are checked more carefully
     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() )
-        preg_match('#/wp-admin/user/?(.*?)$#i', $PHP_SELF, $self_matches);
+        preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
     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 = trim($pagenow, '/');
@@ -34 +34 @@
     }
 } 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]);
     else

trunk/wp-settings.php

@@ -76 +76 @@
 
 // Set the database table prefix and the format specifiers for database table columns.
+$GLOBALS['table_prefix'] = $table_prefix;
 wp_set_wpdb_vars();