Changeset 13251 for trunk/wp-settings.php

Timestamp:

02/20/2010 12:50:09 PM (15 years ago)

Author:

nacin

Message:

Force fatal errors via require() if we're missing something we need. fixes #11681, also fixes #11834

File:

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

trunk/wp-settings.php

@@ -58 +58 @@
 // For an advanced caching plugin to use. Uses a static drop-in because you would only want one.
 if ( WP_CACHE )
-    @include WP_CONTENT_DIR . '/advanced-cache.php';
+    @include( WP_CONTENT_DIR . '/advanced-cache.php' );
 
 // Define WP_LANG_DIR if not set.
@@ -80 +80 @@
 require( ABSPATH . WPINC . '/plugin.php' );
 require( ABSPATH . WPINC . '/default-filters.php' );
-include_once( ABSPATH . WPINC . '/pomo/mo.php' );
+require( ABSPATH . WPINC . '/pomo/mo.php' );
 
 // Initialize multisite if enabled.
@@ -93 +93 @@
 
 // Load the l18n library.
-require_once ( ABSPATH . WPINC . '/l10n.php' );
+require( ABSPATH . WPINC . '/l10n.php' );
 
 // Run the installer if WordPress is not installed.
@@ -132 +132 @@
 // Load multisite-specific files.
 if ( is_multisite() ) {
-    require_once( ABSPATH . WPINC . '/ms-functions.php' );
-    require_once( ABSPATH . WPINC . '/ms-default-filters.php' );
-    require_once( ABSPATH . WPINC . '/ms-deprecated.php' );
+    require( ABSPATH . WPINC . '/ms-functions.php' );
+    require( ABSPATH . WPINC . '/ms-default-filters.php' );
+    require( ABSPATH . WPINC . '/ms-deprecated.php' );
 }
 
@@ -152 +152 @@
 if ( is_multisite() ) {
     if ( true !== ( $file = ms_site_check() ) ) {
-        require_once( $file );
+        require( $file );
         die();
     }
@@ -247 +247 @@
 $locale_file = WP_LANG_DIR . "/$locale.php";
 if ( is_readable( $locale_file ) )
-    require_once( $locale_file );
+    require( $locale_file );
 unset($locale_file);
 
 // Pull in locale data after loading text domain.
-require_once( ABSPATH . WPINC . '/locale.php' );
+require( ABSPATH . WPINC . '/locale.php' );
 
 /**