<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13251] trunk/wp-settings.php: Force fatal errors via require() if we'
re missing something we need.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13251">13251</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-20 12:50:09 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Force fatal errors via require() if we're missing something we need. fixes <a href="http://trac.wordpress.org/ticket/11681">#11681</a>, also fixes <a href="http://trac.wordpress.org/ticket/11834">#11834</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (13250 => 13251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-02-20 12:28:10 UTC (rev 13250)
+++ trunk/wp-settings.php 2010-02-20 12:50:09 UTC (rev 13251)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> // For an advanced caching plugin to use. Uses a static drop-in because you would only want one.
</span><span class="cx"> if ( WP_CACHE )
</span><del>- @include WP_CONTENT_DIR . '/advanced-cache.php';
</del><ins>+ @include( WP_CONTENT_DIR . '/advanced-cache.php' );
</ins><span class="cx">
</span><span class="cx"> // Define WP_LANG_DIR if not set.
</span><span class="cx"> wp_set_lang_dir();
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> // Load early WordPress files.
</span><span class="cx"> require( ABSPATH . WPINC . '/plugin.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/default-filters.php' );
</span><del>-include_once( ABSPATH . WPINC . '/pomo/mo.php' );
</del><ins>+require( ABSPATH . WPINC . '/pomo/mo.php' );
</ins><span class="cx">
</span><span class="cx"> // Initialize multisite if enabled.
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Load the l18n library.
</span><del>-require_once ( ABSPATH . WPINC . '/l10n.php' );
</del><ins>+require( ABSPATH . WPINC . '/l10n.php' );
</ins><span class="cx">
</span><span class="cx"> // Run the installer if WordPress is not installed.
</span><span class="cx"> wp_not_installed();
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx">
</span><span class="cx"> // Load multisite-specific files.
</span><span class="cx"> if ( is_multisite() ) {
</span><del>- require_once( ABSPATH . WPINC . '/ms-functions.php' );
- require_once( ABSPATH . WPINC . '/ms-default-filters.php' );
- require_once( ABSPATH . WPINC . '/ms-deprecated.php' );
</del><ins>+ require( ABSPATH . WPINC . '/ms-functions.php' );
+ require( ABSPATH . WPINC . '/ms-default-filters.php' );
+ require( ABSPATH . WPINC . '/ms-deprecated.php' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Define constants that rely on the API to obtain the default value.
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> // Check site status if multisite.
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> if ( true !== ( $file = ms_site_check() ) ) {
</span><del>- require_once( $file );
</del><ins>+ require( $file );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx"> unset($file);
</span><span class="lines">@@ -246,11 +246,11 @@
</span><span class="cx"> $locale = get_locale();
</span><span class="cx"> $locale_file = WP_LANG_DIR . "/$locale.php";
</span><span class="cx"> if ( is_readable( $locale_file ) )
</span><del>- require_once( $locale_file );
</del><ins>+ require( $locale_file );
</ins><span class="cx"> unset($locale_file);
</span><span class="cx">
</span><span class="cx"> // Pull in locale data after loading text domain.
</span><del>-require_once( ABSPATH . WPINC . '/locale.php' );
</del><ins>+require( ABSPATH . WPINC . '/locale.php' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Locale object for loading locale domain date and various strings.
</span></span></pre>
</div>
</div>
</body>
</html>