diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index fb526b5959..d28d99b972 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -16,11 +16,11 @@
 if ( is_admin() ) {
 	// 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, '/');
 	$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)
 	}
 } 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
 		$pagenow = 'index.php';
diff --git a/wp-settings.php b/wp-settings.php
index 6c5346f98b..7897e73478 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -75,6 +75,7 @@ require( ABSPATH . WPINC . '/plugin.php' );
 require_wp_db();
 
 // Set the database table prefix and the format specifiers for database table columns.
+$GLOBALS['table_prefix'] = $table_prefix;
 wp_set_wpdb_vars();
 
 // Start the WordPress object cache, or an external object cache if the drop-in is present.