WordPress 3.3.2-scripts

[autoinstalls/wordpress.git] / wp-settings.php

diff --git a/wp-settings.php b/wp-settings.php
index 9b89b577a184e002c1549a70ba977030b5865b19..7897e7347831ef9a9c4692f8bf66375a49b61c5e 100644 (file)
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -29,8 +29,8 @@ wp_initial_constants( );
 wp_check_php_mysql_versions();
 
 // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.
-set_magic_quotes_runtime( 0 );
-@ini_set( 'magic_quotes_sybase', 0 );
+@ini_set( 'magic_quotes_runtime', 0 );
+@ini_set( 'magic_quotes_sybase',  0 );
 
 // Set default timezone in PHP 5.
 if ( function_exists( 'date_default_timezone_set' ) )
@@ -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.
@@ -92,6 +93,8 @@ if ( is_multisite() ) {
        define( 'MULTISITE', false );
 }
 
+register_shutdown_function( 'shutdown_action_hook' );
+
 // Stop most of WordPress from being loaded if we just want the basics.
 if ( SHORTINIT )
        return false;
@@ -102,6 +105,7 @@ require( ABSPATH . WPINC . '/l10n.php' );
 // Run the installer if WordPress is not installed.
 wp_not_installed();
 
+
 // Load most of WordPress.
 require( ABSPATH . WPINC . '/class-wp-walker.php' );
 require( ABSPATH . WPINC . '/class-wp-ajax-response.php' );
@@ -247,7 +251,7 @@ $wp = new WP();
  * @global object $wp_widget_factory
  * @since 2.8.0
  */
-$wp_widget_factory = new WP_Widget_Factory();
+$GLOBALS['wp_widget_factory'] = new WP_Widget_Factory();
 
 do_action( 'setup_theme' );
 
@@ -272,7 +276,7 @@ require( ABSPATH . WPINC . '/locale.php' );
  * @global object $wp_locale
  * @since 2.1.0
  */
-$wp_locale = new WP_Locale();
+$GLOBALS['wp_locale'] = new WP_Locale();
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
 if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
@@ -287,8 +291,6 @@ do_action( 'after_setup_theme' );
 // Load any template functions the theme supports.
 require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
 
-register_shutdown_function( 'shutdown_action_hook' );
-
 // Set up current user.
 $wp->init();