Changes in trunk/wp-settings.php [16558:18263]

File:

• trunk/wp-settings.php (modified) (7 diffs)

trunk/wp-settings.php

@@ -21 +21 @@
 require( ABSPATH . WPINC . '/version.php' );
 
-// Set initial default constants including WP_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
+// Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
 wp_initial_constants( );
 
@@ -44 +44 @@
 wp_check_php_mysql_versions();
 
-// Check if we have recieved a request due to missing favicon.ico
+// Check if we have received a request due to missing favicon.ico
 wp_favicon_request();
 
@@ -217 +217 @@
  * @since 2.0.0
  */
-$wp_the_query =& new WP_Query();
+$wp_the_query = new WP_Query();
 
 /**
@@ -232 +232 @@
  * @since 1.5.0
  */
-$wp_rewrite =& new WP_Rewrite();
+$wp_rewrite = new WP_Rewrite();
 
 /**
@@ -239 +239 @@
  * @since 2.0.0
  */
-$wp =& new WP();
+$wp = new WP();
 
 /**
@@ -246 +246 @@
  * @since 2.8.0
  */
-$wp_widget_factory =& new WP_Widget_Factory();
+$wp_widget_factory = new WP_Widget_Factory();
 
 do_action( 'setup_theme' );
@@ -271 +271 @@
  * @since 2.1.0
  */
-$wp_locale =& new WP_Locale();
+$wp_locale = new WP_Locale();
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
-if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
-    include( STYLESHEETPATH . '/functions.php' );
-if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
-    include( TEMPLATEPATH . '/functions.php' );
+if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
+    if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
+        include( STYLESHEETPATH . '/functions.php' );
+    if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
+        include( TEMPLATEPATH . '/functions.php' );
+}
 
 do_action( 'after_setup_theme' );