Changes from branches/3.1/wp-settings.php at r18356 to trunk/wp-settings.php at r18375
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-settings.php
r18356 r18375 5 5 * 6 6 * Allows for some configuration in wp-config.php (see default-constants.php) 7 * 8 * @internal This file must be parsable by PHP4. 7 9 * 8 10 * @package WordPress … … 21 23 require( ABSPATH . WPINC . '/version.php' ); 22 24 23 // Set initial default constants including WP_MEMORY_LIMIT, WP_ DEBUG, WP_CONTENT_DIR and WP_CACHE.25 // Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE. 24 26 wp_initial_constants( ); 27 28 // Check for the required PHP version and for the MySQL extension or a database drop-in. 29 wp_check_php_mysql_versions(); 25 30 26 31 // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php. … … 41 46 wp_fix_server_vars(); 42 47 43 // Check for the required PHP version and for the MySQL extension or a database drop-in. 44 wp_check_php_mysql_versions(); 45 46 // Check if we have recieved a request due to missing favicon.ico 48 // Check if we have received a request due to missing favicon.ico 47 49 wp_favicon_request(); 48 50 … … 217 219 * @since 2.0.0 218 220 */ 219 $wp_the_query = &new WP_Query();221 $wp_the_query = new WP_Query(); 220 222 221 223 /** … … 232 234 * @since 1.5.0 233 235 */ 234 $wp_rewrite = &new WP_Rewrite();236 $wp_rewrite = new WP_Rewrite(); 235 237 236 238 /** … … 239 241 * @since 2.0.0 240 242 */ 241 $wp = &new WP();243 $wp = new WP(); 242 244 243 245 /** … … 246 248 * @since 2.8.0 247 249 */ 248 $wp_widget_factory = &new WP_Widget_Factory();250 $wp_widget_factory = new WP_Widget_Factory(); 249 251 250 252 do_action( 'setup_theme' ); … … 271 273 * @since 2.1.0 272 274 */ 273 $wp_locale = &new WP_Locale();275 $wp_locale = new WP_Locale(); 274 276 275 277 // Load the functions for the active theme, for both parent and child theme if applicable. 276 if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) 277 include( STYLESHEETPATH . '/functions.php' ); 278 if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) 279 include( TEMPLATEPATH . '/functions.php' ); 278 if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) { 279 if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) 280 include( STYLESHEETPATH . '/functions.php' ); 281 if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) 282 include( TEMPLATEPATH . '/functions.php' ); 283 } 280 284 281 285 do_action( 'after_setup_theme' );
Note: See TracChangeset
for help on using the changeset viewer.