<!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>[12762] trunk: phpdoc for load.php, return some includes to global scope.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12762">12762</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-19 17:27:03 +0000 (Tue, 19 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>phpdoc for load.php, return some includes to global scope. Props nacin. see <a href="http://trac.wordpress.org/ticket/11881">#11881</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (12761 => 12762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-01-19 17:08:04 UTC (rev 12761)
+++ trunk/wp-includes/load.php 2010-01-19 17:27:03 UTC (rev 12762)
</span><span class="lines">@@ -14,44 +14,50 @@
</span><span class="cx"> * @return null Will return null if register_globals PHP directive was disabled
</span><span class="cx"> */
</span><span class="cx"> function wp_unregister_GLOBALS() {
</span><del>- if ( !ini_get('register_globals') )
</del><ins>+ if ( !ini_get( 'register_globals' ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( isset($_REQUEST['GLOBALS']) )
- die('GLOBALS overwrite attempt detected');
</del><ins>+ if ( isset( $_REQUEST['GLOBALS'] ) )
+ die( 'GLOBALS overwrite attempt detected' );
</ins><span class="cx">
</span><span class="cx"> // Variables that shouldn't be unset
</span><del>- $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
</del><ins>+ $noUnset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
</ins><span class="cx">
</span><del>- $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
</del><ins>+ $input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
</ins><span class="cx"> foreach ( $input as $k => $v )
</span><del>- if ( !in_array($k, $noUnset) && isset($GLOBALS[$k]) ) {
</del><ins>+ if ( !in_array( $k, $noUnset ) && isset( $GLOBALS[$k] ) ) {
</ins><span class="cx"> $GLOBALS[$k] = NULL;
</span><del>- unset($GLOBALS[$k]);
</del><ins>+ unset( $GLOBALS[$k] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Fix $_SERVER variables for various setups.
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_fix_server_vars() {
</span><span class="cx"> global $PHP_SELF;
</span><span class="cx"> // Fix for IIS when running with PHP ISAPI
</span><span class="cx"> if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
</span><span class="cx">
</span><span class="cx"> // IIS Mod-Rewrite
</span><del>- if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
</del><ins>+ if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
</ins><span class="cx"> $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
</span><span class="cx"> }
</span><span class="cx"> // IIS Isapi_Rewrite
</span><del>- else if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
</del><ins>+ else if ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
</ins><span class="cx"> $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> // Use ORIG_PATH_INFO if there is no PATH_INFO
</span><del>- if ( !isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']) )
</del><ins>+ if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
</ins><span class="cx"> $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
</span><span class="cx">
</span><span class="cx"> // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
</span><del>- if ( isset($_SERVER['PATH_INFO']) ) {
</del><ins>+ if ( isset( $_SERVER['PATH_INFO'] ) ) {
</ins><span class="cx"> if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
</span><span class="cx"> $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
</span><span class="cx"> else
</span><span class="lines">@@ -59,26 +65,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Append the query string if it exists and isn't null
</span><del>- if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
</del><ins>+ if ( isset( $_SERVER['QUERY_STRING'] ) && !empty( $_SERVER['QUERY_STRING'] ) ) {
</ins><span class="cx"> $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
</span><del>- if ( isset($_SERVER['SCRIPT_FILENAME']) && ( strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7 ) )
</del><ins>+ if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
</ins><span class="cx"> $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
</span><span class="cx">
</span><span class="cx"> // Fix for Dreamhost and other PHP as CGI hosts
</span><del>- if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
- unset($_SERVER['PATH_INFO']);
</del><ins>+ if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
+ unset( $_SERVER['PATH_INFO'] );
</ins><span class="cx">
</span><span class="cx"> // Fix empty PHP_SELF
</span><span class="cx"> $PHP_SELF = $_SERVER['PHP_SELF'];
</span><del>- if ( empty($PHP_SELF) )
- $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
</del><ins>+ if ( empty( $PHP_SELF ) )
+ $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( "/(\?.*)?$/",'',$_SERVER["REQUEST_URI"] );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Check for the required PHP version, and the MySQL extension or a database drop-in.
+ *
+ * Dies if requirements are not met.
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_check_php_mysql_versions() {
</span><span class="cx"> // we can probably extend this function to check if wp_die() exists then use translated strings, and then use it in install.php etc.
</span><span class="cx">
</span><span class="lines">@@ -87,27 +101,45 @@
</span><span class="cx"> if ( version_compare( $required_php_version, $php_version, '>' ) )
</span><span class="cx"> die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %1$s but WordPress %2%s requires at least %2%s.'/*/WP_I18N_OLD_PHP*/, $php_version, $wp_version, $required_php_version ) );
</span><span class="cx">
</span><del>- if ( !extension_loaded('mysql') && !file_exists(WP_CONTENT_DIR . '/db.php') )
</del><ins>+ if ( !extension_loaded( 'mysql' ) && !file_exists( WP_CONTENT_DIR . '/db.php' ) )
</ins><span class="cx"> die( /*WP_I18N_OLD_MYSQL*/'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'/*/WP_I18N_OLD_MYSQL*/ );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Dies with a maintenance message when conditions are met.
+ *
+ * Checks for a file in the WordPress root directory named ".maintenance".
+ * This file will contain the variable $upgrading, set to the time the file
+ * was created. If the file was created less than 10 minutes ago, WordPress
+ * enters maintenance mode and displays a message.
+ *
+ * The default message can be replaced by using a drop-in (maintenance.php in
+ * the wp-content directory).
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_maintenance() {
</span><del>- if ( file_exists(ABSPATH . '.maintenance') && !defined('WP_INSTALLING') ) {
- include(ABSPATH . '.maintenance');
- // If the $upgrading timestamp is older than 10 minutes, don't die.
- if ( ( time() - $upgrading ) < 600 ) {
- if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
- require_once( WP_CONTENT_DIR . '/maintenance.php' );
- die();
- }
</del><ins>+ if ( !file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) )
+ return;
</ins><span class="cx">
</span><del>- $protocol = $_SERVER["SERVER_PROTOCOL"];
- if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
- $protocol = 'HTTP/1.0';
- header( "$protocol 503 Service Unavailable", true, 503 );
- header( 'Content-Type: text/html; charset=utf-8' );
- header( 'Retry-After: 600' );
- ?>
</del><ins>+ include( ABSPATH . '.maintenance' );
+ // If the $upgrading timestamp is older than 10 minutes, don't die.
+ if ( ( time() - $upgrading ) >= 600 )
+ return;
+
+ if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
+ require_once( WP_CONTENT_DIR . '/maintenance.php' );
+ die();
+ }
+
+ $protocol = $_SERVER["SERVER_PROTOCOL"];
+ if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
+ $protocol = 'HTTP/1.0';
+ header( "$protocol 503 Service Unavailable", true, 503 );
+ header( 'Content-Type: text/html; charset=utf-8' );
+ header( 'Retry-After: 600' );
+?>
</ins><span class="cx"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml">
</span><span class="cx"> <head>
</span><span class="lines">@@ -119,10 +151,8 @@
</span><span class="cx"> <h1>Briefly unavailable for scheduled maintenance. Check back in a minute.</h1>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span><del>- <?php
- die();
- }
- }
</del><ins>+<?php
+ die();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -135,7 +165,7 @@
</span><span class="cx"> */
</span><span class="cx"> function timer_start() {
</span><span class="cx"> global $timestart;
</span><del>- $mtime = explode(' ', microtime() );
</del><ins>+ $mtime = explode( ' ', microtime() );
</ins><span class="cx"> $mtime = $mtime[1] + $mtime[0];
</span><span class="cx"> $timestart = $mtime;
</span><span class="cx"> return true;
</span><span class="lines">@@ -165,223 +195,272 @@
</span><span class="cx"> * @param int $precision The amount of digits from the right of the decimal to display. Default is 3.
</span><span class="cx"> * @return float The "second.microsecond" finished time calculation
</span><span class="cx"> */
</span><del>-function timer_stop($display = 0, $precision = 3) { //if called like timer_stop(1), will echo $timetotal
</del><ins>+function timer_stop( $display = 0, $precision = 3 ) { // if called like timer_stop(1), will echo $timetotal
</ins><span class="cx"> global $timestart, $timeend;
</span><span class="cx"> $mtime = microtime();
</span><del>- $mtime = explode(' ',$mtime);
</del><ins>+ $mtime = explode( ' ',$mtime );
</ins><span class="cx"> $mtime = $mtime[1] + $mtime[0];
</span><span class="cx"> $timeend = $mtime;
</span><span class="cx"> $timetotal = $timeend-$timestart;
</span><del>- $r = ( function_exists('number_format_i18n') ) ? number_format_i18n($timetotal, $precision) : number_format($timetotal, $precision);
</del><ins>+ $r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
</ins><span class="cx"> if ( $display )
</span><span class="cx"> echo $r;
</span><span class="cx"> return $r;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Sets PHP error handling.
+ *
+ * Add <code>define('WP_DEBUG', true);</code> to wp-config.php to enable
+ * the reporting of notices during development.
+ *
+ * Add <code>define('WP_DEBUG_DISPLAY', false);</code> to wp-config.php to
+ * disable the display of errors.
+ *
+ * Add <code>define('WP_DEBUG_LOG', true);</code> to wp-config.php to log
+ * eerrors to debug.log in the wp-content directory.
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_debug_mode() {
</span><span class="cx"> if ( WP_DEBUG ) {
</span><del>- if ( defined('E_DEPRECATED') )
- error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
</del><ins>+ if ( defined( 'E_DEPRECATED' ) )
+ error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
</ins><span class="cx"> else
</span><del>- error_reporting(E_ALL);
</del><ins>+ error_reporting( E_ALL );
</ins><span class="cx">
</span><span class="cx"> if ( WP_DEBUG_DISPLAY )
</span><del>- ini_set('display_errors', 1);
</del><ins>+ ini_set( 'display_errors', 1 );
</ins><span class="cx">
</span><span class="cx"> if ( WP_DEBUG_LOG ) {
</span><del>- ini_set('log_errors', 1);
- ini_set('error_log', WP_CONTENT_DIR . '/debug.log');
</del><ins>+ ini_set( 'log_errors', 1 );
+ ini_set( 'error_log', WP_CONTENT_DIR . '/debug.log' );
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- if ( defined('E_RECOVERABLE_ERROR') )
- error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
</del><ins>+ if ( defined( 'E_RECOVERABLE_ERROR' ) )
+ error_reporting( E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
</ins><span class="cx"> else
</span><del>- error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
</del><ins>+ error_reporting( E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Sets the location of the language directory.
+ *
+ * To set directory manually, define <code>WP_LANG_DIR</code> in wp-config.php.
+ *
+ * First looks for language folder in WP_CONTENT_DIR and uses that folder if it
+ * exists. Or it uses the "languages" folder in WPINC.
+ *
+ * The WP_LANG_DIR constant was introduced in 2.1.0.
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_set_lang_dir() {
</span><del>- if ( !defined('WP_LANG_DIR') ) {
- /**
- * Stores the location of the language directory. First looks for language folder in WP_CONTENT_DIR
- * and uses that folder if it exists. Or it uses the "languages" folder in WPINC.
- *
- * @since 2.1.0
- */
- if ( file_exists(WP_CONTENT_DIR . '/languages') && @is_dir(WP_CONTENT_DIR . '/languages') ) {
- define('WP_LANG_DIR', WP_CONTENT_DIR . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
- if (!defined('LANGDIR')) {
</del><ins>+ if ( !defined( 'WP_LANG_DIR' ) ) {
+ if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) ) {
+ define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' ); // no leading slash, no trailing slash, full path, not relative to ABSPATH
+ if ( !defined( 'LANGDIR' ) ) {
</ins><span class="cx"> // Old static relative path maintained for limited backwards compatibility - won't work in some cases
</span><del>- define('LANGDIR', 'wp-content/languages');
</del><ins>+ define( 'LANGDIR', 'wp-content/languages' );
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- define('WP_LANG_DIR', ABSPATH . WPINC . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
- if (!defined('LANGDIR')) {
</del><ins>+ define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' ); // no leading slash, no trailing slash, full path, not relative to ABSPATH
+ if ( !defined( 'LANGDIR' ) ) {
</ins><span class="cx"> // Old relative path maintained for backwards compatibility
</span><del>- define('LANGDIR', WPINC . '/languages');
</del><ins>+ define( 'LANGDIR', WPINC . '/languages' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Sets the database table prefix and the format specifiers for database table columns.
+ *
+ * Columns not listed here default to %s.
+ *
+ * @see wpdb::$field_types Since 2.8.0
+ * @see wpdb::prepare()
+ * @see wpdb::insert()
+ * @see wpdb::update()
+ * @see wpdb::set_prefix()
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_set_wpdb_vars() {
</span><span class="cx"> global $wpdb, $table_prefix;
</span><del>- if ( !empty($wpdb->error) )
</del><ins>+ if ( !empty( $wpdb->error ) )
</ins><span class="cx"> dead_db();
</span><span class="cx">
</span><del>- /**
- * Format specifiers for DB columns. Columns not listed here default to %s.
- * @since 2.8.0
- * @see wpdb:$field_types
- * @see wpdb:prepare()
- * @see wpdb:insert()
- * @see wpdb:update()
- */
</del><span class="cx"> $wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
</span><span class="cx"> 'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'commment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
</span><span class="cx"> 'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
</span><del>- 'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d');
</del><ins>+ 'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d' );
</ins><span class="cx">
</span><del>- $prefix = $wpdb->set_prefix($table_prefix);
</del><ins>+ $prefix = $wpdb->set_prefix( $table_prefix );
</ins><span class="cx">
</span><del>- if ( is_wp_error($prefix) )
- wp_die(/*WP_I18N_BAD_PREFIX*/'<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/);
-
</del><ins>+ if ( is_wp_error( $prefix ) )
+ wp_die( /*WP_I18N_BAD_PREFIX*/'<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/ );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Starts the WordPress object cache.
+ *
+ * If an object-cache.php file exists in the wp-content directory,
+ * it uses that drop-in as an external object cache.
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_start_object_cache() {
</span><span class="cx"> global $_wp_using_ext_object_cache;
</span><del>- if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
- require_once (WP_CONTENT_DIR . '/object-cache.php');
</del><ins>+ if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+ require_once ( WP_CONTENT_DIR . '/object-cache.php' );
</ins><span class="cx"> $_wp_using_ext_object_cache = true;
</span><span class="cx"> } else {
</span><del>- require_once (ABSPATH . WPINC . '/cache.php');
</del><ins>+ require_once ( ABSPATH . WPINC . '/cache.php' );
</ins><span class="cx"> $_wp_using_ext_object_cache = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_cache_init();
</span><del>-
- if ( function_exists('wp_cache_add_global_groups') ) {
- wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
- wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
</del><ins>+ if ( function_exists( 'wp_cache_add_global_groups' ) ) {
+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss' ) );
+ wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Redirects to the installer if WordPress is not installed.
+ *
+ * Dies with an error message when multisite is enabled.
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_not_installed() {
</span><span class="cx"> if ( is_multisite() ) {
</span><del>- if ( !is_blog_installed() && !defined('WP_INSTALLING') )
- die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here
- } elseif ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
- if ( defined('WP_SITEURL') )
</del><ins>+ if ( !is_blog_installed() && !defined( 'WP_INSTALLING' ) )
+ wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) );
+ } elseif ( !is_blog_installed() && ( strpos( $_SERVER['PHP_SELF'], 'install.php' ) === false && !defined( 'WP_INSTALLING' ) ) ) {
+ if ( defined( 'WP_SITEURL' ) )
</ins><span class="cx"> $link = WP_SITEURL . '/wp-admin/install.php';
</span><del>- elseif (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
- $link = preg_replace('|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF']) . 'wp-admin/install.php';
</del><ins>+ elseif ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false )
+ $link = preg_replace( '|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
</ins><span class="cx"> else
</span><del>- $link = preg_replace('|/[^/]+?$|', '/', $_SERVER['PHP_SELF']) . 'wp-admin/install.php';
- require_once(ABSPATH . WPINC . '/kses.php');
- require_once(ABSPATH . WPINC . '/pluggable.php');
- require_once(ABSPATH . WPINC . '/formatting.php');
- wp_redirect($link);
</del><ins>+ $link = preg_replace( '|/[^/]+?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
+ require_once( ABSPATH . WPINC . '/kses.php' );
+ require_once( ABSPATH . WPINC . '/pluggable.php' );
+ require_once( ABSPATH . WPINC . '/formatting.php' );
+ wp_redirect( $link );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function wp_load_mu_plugins() {
- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- if ( $dh = opendir( WPMU_PLUGIN_DIR ) ) {
- $mu_plugins = array ();
- while ( ( $plugin = readdir( $dh ) ) !== false ) {
- if ( substr( $plugin, -4 ) == '.php' )
- $mu_plugins[] = $plugin;
- }
- closedir( $dh );
- sort( $mu_plugins );
- foreach ( $mu_plugins as $mu_plugin )
- include_once( WPMU_PLUGIN_DIR . '/' . $mu_plugin );
- }
</del><ins>+/**
+ * Returns array of must-use plugin files to be included in global scope.
+ *
+ * The default directory is wp-content/mu-plugins. To change the default directory
+ * manually, define <code>WPMU_PLUGIN_DIR</code> and <code>WPMU_PLUGIN_URL</code>
+ * in wp-config.php.
+ *
+ * @access private
+ * @since 3.0.0
+ * @return array Files to include
+ */
+function wp_muplugins_to_load() {
+ $mu_plugins = array();
+ if ( !is_dir( WPMU_PLUGIN_DIR ) )
+ return $mu_plugins;
+ if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
+ return $mu_plugins;
+ while ( ( $plugin = readdir( $dh ) ) !== false ) {
+ if ( substr( $plugin, -4 ) == '.php' )
+ $mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
</ins><span class="cx"> }
</span><ins>+ closedir( $dh );
+ sort( $mu_plugins );
+
+ return $mu_plugins;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function wp_load_plugins() {
</del><ins>+/**
+ * Returns array of plugin files to be included in global scope.
+ *
+ * The default directory is wp-content/plugins. To change the default directory
+ * manually, define <code>WP_PLUGIN_DIR</code> and <code>WP_PLUGIN_URL</code>
+ * in wp-config.php.
+ *
+ * @access private
+ * @since 3.0.0
+ * @return array Files to include
+ */
+function wp_plugins_to_load() {
+ $plugins = array();
+
</ins><span class="cx"> // Check for hacks file if the option is enabled
</span><del>- if ( get_option('hack_file') ) {
- if ( file_exists(ABSPATH . 'my-hacks.php') )
- require(ABSPATH . 'my-hacks.php');
- }
</del><ins>+ if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) )
+ $plugins[] = ABSPATH . 'my-hacks.php';
</ins><span class="cx">
</span><del>- $current_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins' ) );
- if ( is_array($current_plugins) && !defined('WP_INSTALLING') ) {
- foreach ( $current_plugins as $plugin ) {
- // check the $plugin filename
- // Validate plugin filename
- if ( validate_file($plugin) // $plugin must validate as file
- || '.php' != substr($plugin, -4) // $plugin must end with '.php'
- || !file_exists(WP_PLUGIN_DIR . '/' . $plugin) // $plugin must exist
- )
- continue;
-
- include_once(WP_PLUGIN_DIR . '/' . $plugin);
- }
- unset($plugin);
</del><ins>+ $active_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins' ) );
+ if ( !is_array( $active_plugins ) || defined( 'WP_INSTALLING' ) )
+ return $plugins;
+ foreach ( $active_plugins as $plugin ) {
+ if ( validate_file( $plugin ) // $plugin must validate as file
+ || '.php' != substr( $plugin, -4 ) // $plugin must end with '.php'
+ || !file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+ )
+ continue;
+ $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
</ins><span class="cx"> }
</span><del>- unset($current_plugins);
</del><ins>+ return $plugins;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Sets internal encoding using mb_internal_encoding().
+ *
+ * In most cases the default internal encoding is latin1, which is of no use,
+ * since we want to use the mb_ functions for utf-8 strings.
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_set_internal_encoding() {
</span><del>- /*
- * In most cases the default internal encoding is latin1, which is of no use,
- * since we want to use the mb_ functions for utf-8 strings
- */
- if (function_exists('mb_internal_encoding')) {
- if (!@mb_internal_encoding(get_option('blog_charset')))
- mb_internal_encoding('UTF-8');
</del><ins>+ if ( function_exists( 'mb_internal_encoding' ) ) {
+ if ( !@mb_internal_encoding( get_option( 'blog_charset' ) ) )
+ mb_internal_encoding( 'UTF-8' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Add magic quotes to $_GET, $_POST, $_COOKIE, and $_SERVER.
+ *
+ * Also forces $_REQUEST to be $_GET + $_POST. If $_SERVER, $_COOKIE,
+ * or $_ENV are needed, use those superglobals directly.
+ *
+ * @access private
+ * @since 3.0.0
+ */
</ins><span class="cx"> function wp_magic_quotes() {
</span><span class="cx"> // If already slashed, strip.
</span><span class="cx"> if ( get_magic_quotes_gpc() ) {
</span><del>- $_GET = stripslashes_deep($_GET );
- $_POST = stripslashes_deep($_POST );
- $_COOKIE = stripslashes_deep($_COOKIE);
</del><ins>+ $_GET = stripslashes_deep( $_GET );
+ $_POST = stripslashes_deep( $_POST );
+ $_COOKIE = stripslashes_deep( $_COOKIE );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Escape with wpdb.
</span><del>- $_GET = add_magic_quotes($_GET );
- $_POST = add_magic_quotes($_POST );
- $_COOKIE = add_magic_quotes($_COOKIE);
- $_SERVER = add_magic_quotes($_SERVER);
</del><ins>+ $_GET = add_magic_quotes( $_GET );
+ $_POST = add_magic_quotes( $_POST );
+ $_COOKIE = add_magic_quotes( $_COOKIE );
+ $_SERVER = add_magic_quotes( $_SERVER );
</ins><span class="cx">
</span><del>- // Force REQUEST to be GET + POST. If SERVER, COOKIE, or ENV are needed, use those superglobals directly.
- $_REQUEST = array_merge($_GET, $_POST);
</del><ins>+ // Force REQUEST to be GET + POST.
+ $_REQUEST = array_merge( $_GET, $_POST );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function wp_find_locale() {
- global $locale, $locale_file;
- /**
- * The locale of the blog
- * @since 1.5.0
- */
- $locale = get_locale();
- $locale_file = WP_LANG_DIR . "/$locale.php";
- if ( is_readable($locale_file) )
- require_once($locale_file);
-
- // Pull in locale data after loading text domain.
- require_once(ABSPATH . WPINC . '/locale.php');
-}
-
-function wp_load_theme_functions() {
- // Load functions for active theme.
- if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . '/functions.php') )
- include(STYLESHEETPATH . '/functions.php');
- if ( file_exists(TEMPLATEPATH . '/functions.php') )
- include(TEMPLATEPATH . '/functions.php');
-
- // Load in support for template functions which the theme supports
- require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
-}
-
</del><span class="cx"> /**
</span><span class="cx"> * Runs just before PHP shuts down execution.
</span><span class="cx"> *
</span><span class="lines">@@ -389,7 +468,7 @@
</span><span class="cx"> * @since 1.2.0
</span><span class="cx"> */
</span><span class="cx"> function shutdown_action_hook() {
</span><del>- do_action('shutdown');
</del><ins>+ do_action( 'shutdown' );
</ins><span class="cx"> wp_cache_close();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -422,7 +501,7 @@
</span><span class="cx"> * @return bool True if inside WordPress administration pages.
</span><span class="cx"> */
</span><span class="cx"> function is_admin() {
</span><del>- if ( defined('WP_ADMIN') )
</del><ins>+ if ( defined( 'WP_ADMIN' ) )
</ins><span class="cx"> return WP_ADMIN;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -435,7 +514,7 @@
</span><span class="cx"> * @return bool True if multisite is enabled, false otherwise.
</span><span class="cx"> */
</span><span class="cx"> function is_multisite() {
</span><del>- if ( ( defined('MULTISITE') && MULTISITE ) || defined('VHOST') || defined('SUNRISE') )
</del><ins>+ if ( ( defined( 'MULTISITE' ) && MULTISITE ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (12761 => 12762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-01-19 17:08:04 UTC (rev 12761)
+++ trunk/wp-includes/ms-load.php 2010-01-19 17:27:03 UTC (rev 12762)
</span><span class="lines">@@ -13,9 +13,9 @@
</span><span class="cx"> if( defined( 'SUNRISE' ) )
</span><span class="cx"> include_once( WP_CONTENT_DIR . '/sunrise.php' );
</span><span class="cx">
</span><del>- require (ABSPATH . WPINC . '/ms-settings.php');
-$wpdb->blogid = $current_blog->blog_id;
-$wpdb->siteid = $current_blog->site_id;
</del><ins>+ require( ABSPATH . WPINC . '/ms-settings.php' );
+$wpdb->blogid = $current_blog->blog_id;
+$wpdb->siteid = $current_blog->site_id;
</ins><span class="cx"> $wpdb->set_prefix($table_prefix); // set up blog tables
</span><span class="cx"> $table_prefix = $wpdb->get_blog_prefix();
</span><span class="cx">
</span><span class="lines">@@ -40,56 +40,57 @@
</span><span class="cx"> define( "BLOGUPLOADDIR", WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
</span><span class="cx">
</span><span class="cx"> function ms_network_settings() {
</span><del>- global $wpdb, $current_site, $cookiehash;
</del><ins>+ global $wpdb, $current_site, $cookiehash;
</ins><span class="cx">
</span><del>- if( !isset($current_site->site_name) )
- $current_site->site_name = get_site_option('site_name');
</del><ins>+ if( !isset($current_site->site_name) )
+ $current_site->site_name = get_site_option('site_name');
</ins><span class="cx">
</span><del>- if( $current_site->site_name == false )
- $current_site->site_name = ucfirst( $current_site->domain );
</del><ins>+ if( $current_site->site_name == false )
+ $current_site->site_name = ucfirst( $current_site->domain );
</ins><span class="cx">
</span><del>- if ( ! defined('WP_INSTALLING') ) {
- // Used to guarantee unique hash cookies
- if ( !isset($cookiehash) )
- $cookiehash = '';
</del><ins>+ if ( ! defined('WP_INSTALLING') ) {
+ if ( !isset($cookiehash) )
+ $cookiehash = '';
</ins><span class="cx">
</span><del>- /**
- * Used to guarantee unique hash cookies
- * @since 1.5
- */
- if ( !defined('COOKIEHASH') )
- define( 'COOKIEHASH', $cookiehash );
- }
</del><ins>+ /**
+ * Used to guarantee unique hash cookies
+ * @since 1.5
+ */
+ if ( !defined('COOKIEHASH') )
+ define( 'COOKIEHASH', $cookiehash );
+ }
</ins><span class="cx">
</span><del>- $wpdb->hide_errors();
</del><ins>+ $wpdb->hide_errors();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function ms_network_plugins() {
</span><del>- $wpmu_sitewide_plugins = (array) maybe_unserialize( get_site_option( 'wpmu_sitewide_plugins' ) );
- foreach( $wpmu_sitewide_plugins as $plugin_file => $activation_time ) {
- if ( !$plugin_file )
- continue;
</del><ins>+ $network_plugins = array();
+ $wpmu_sitewide_plugins = (array) maybe_unserialize( get_site_option( 'wpmu_sitewide_plugins' ) );
+ foreach( $wpmu_sitewide_plugins as $plugin_file => $activation_time ) {
+ if ( !$plugin_file )
+ continue;
</ins><span class="cx">
</span><del>- if ( !file_exists( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
- $deleted_sitewide_plugins[] = $plugin_file;
- } else {
- include_once( WP_PLUGIN_DIR . '/' . $plugin_file );
- }
- }
</del><ins>+ if ( !file_exists( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
+ $deleted_sitewide_plugins[] = $plugin_file;
+ } else {
+ $network_plugins = WP_PLUGIN_DIR . '/' . $plugin_file;
+ }
+ }
</ins><span class="cx">
</span><del>- if ( isset( $deleted_sitewide_plugins ) ) {
- $active_sitewide_plugins = maybe_unserialize( get_site_option( 'active_sitewide_plugins' ) );
</del><ins>+ if ( isset( $deleted_sitewide_plugins ) ) {
+ $active_sitewide_plugins = maybe_unserialize( get_site_option( 'active_sitewide_plugins' ) );
</ins><span class="cx">
</span><del>- /* Remove any deleted plugins from the wpmu_sitewide_plugins array */
- foreach( $deleted_sitewide_plugins as $plugin_file ) {
- unset( $wpmu_sitewide_plugins[$plugin_file] );
- unset( $active_sitewide_plugins[$plugin_file] );
- }
</del><ins>+ /* Remove any deleted plugins from the wpmu_sitewide_plugins array */
+ foreach( $deleted_sitewide_plugins as $plugin_file ) {
+ unset( $wpmu_sitewide_plugins[$plugin_file] );
+ unset( $active_sitewide_plugins[$plugin_file] );
+ }
</ins><span class="cx">
</span><del>- update_site_option( 'wpmu_sitewide_plugins', $wpmu_sitewide_plugins );
- update_site_option( 'active_sitewide_plugins', $wpmu_sitewide_plugins );
- }
</del><ins>+ update_site_option( 'wpmu_sitewide_plugins', $wpmu_sitewide_plugins );
+ update_site_option( 'active_sitewide_plugins', $wpmu_sitewide_plugins );
+ }
</ins><span class="cx">
</span><ins>+ return $network_plugins;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function ms_site_check() {
</span><span class="lines">@@ -99,8 +100,7 @@
</span><span class="cx">
</span><span class="cx"> if ( '1' == $current_blog->deleted ) {
</span><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
</span><del>- require_once( WP_CONTENT_DIR . '/blog-deleted.php' );
- die();
</del><ins>+ return WP_CONTENT_DIR . '/blog-deleted.php';
</ins><span class="cx"> } else {
</span><span class="cx"> header('HTTP/1.1 410 Gone');
</span><span class="cx"> graceful_fail(__('This user has elected to delete their account and the content is no longer available.'));
</span><span class="lines">@@ -109,8 +109,7 @@
</span><span class="cx">
</span><span class="cx"> if ( '2' == $current_blog->deleted ) {
</span><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
</span><del>- require_once( WP_CONTENT_DIR . '/blog-inactive.php' );
- die();
</del><ins>+ return WP_CONTENT_DIR . '/blog-inactive.php';
</ins><span class="cx"> } else {
</span><span class="cx"> graceful_fail( sprintf( __( 'This blog has not been activated yet. If you are having problems activating your blog, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
</span><span class="cx"> }
</span><span class="lines">@@ -118,13 +117,13 @@
</span><span class="cx">
</span><span class="cx"> if( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
</span><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
</span><del>- require_once( WP_CONTENT_DIR . '/blog-suspended.php' );
- die();
</del><ins>+ return WP_CONTENT_DIR . '/blog-suspended.php';
</ins><span class="cx"> } else {
</span><span class="cx"> header('HTTP/1.1 410 Gone');
</span><span class="cx"> graceful_fail(__('This blog has been archived or suspended.'));
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function ms_network_cookies() {
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (12761 => 12762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-01-19 17:08:04 UTC (rev 12761)
+++ trunk/wp-settings.php 2010-01-19 17:27:03 UTC (rev 12762)
</span><span class="lines">@@ -13,152 +13,191 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.0.0
</span><span class="cx"> */
</span><del>-define('WPINC', 'wp-includes');
</del><ins>+define( 'WPINC', 'wp-includes' );
</ins><span class="cx">
</span><del>-require (ABSPATH . WPINC . '/load.php');
-require (ABSPATH . WPINC . '/default-constants.php');
-require (ABSPATH . WPINC . '/version.php');
</del><ins>+// Include files required for initialization.
+require( ABSPATH . WPINC . '/load.php' );
+require( ABSPATH . WPINC . '/default-constants.php' );
+require( ABSPATH . WPINC . '/version.php' );
</ins><span class="cx">
</span><del>-wp_default_constants('init');
</del><ins>+// Set initial default constants including WP_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
+wp_default_constants( 'init' );
</ins><span class="cx">
</span><del>-set_magic_quotes_runtime(0);
-@ini_set('magic_quotes_sybase', 0);
</del><ins>+// 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 );
</ins><span class="cx">
</span><del>-if ( function_exists('date_default_timezone_set') )
- date_default_timezone_set('UTC');
</del><ins>+// Set default timezone in PHP 5.
+if ( function_exists( 'date_default_timezone_set' ) )
+ date_default_timezone_set( 'UTC' );
</ins><span class="cx">
</span><ins>+// Turn register_globals off.
</ins><span class="cx"> wp_unregister_GLOBALS();
</span><span class="cx">
</span><ins>+// Ensure these global variables do not exist so they do not interfere with WordPress.
</ins><span class="cx"> unset( $wp_filter, $cache_lastcommentmodified, $cache_lastpostdate );
</span><span class="cx">
</span><ins>+// Standardize $_SERVER variables across setups.
</ins><span class="cx"> wp_fix_server_vars();
</span><span class="cx">
</span><ins>+// Check for the required PHP version and for the MySQL extension or a database drop-in.
</ins><span class="cx"> wp_check_php_mysql_versions();
</span><span class="cx">
</span><ins>+// Check if we're in maintenance mode.
</ins><span class="cx"> wp_maintenance();
</span><span class="cx">
</span><ins>+// Start loading timer.
</ins><span class="cx"> timer_start();
</span><span class="cx">
</span><ins>+// Check if we're in WP_DEBUG mode.
</ins><span class="cx"> wp_debug_mode();
</span><span class="cx">
</span><del>-// For an advanced caching plugin to use, static because you would only want one
</del><ins>+// For an advanced caching plugin to use. Uses a static drop-in because you would only want one.
</ins><span class="cx"> if ( WP_CACHE )
</span><span class="cx"> @include WP_CONTENT_DIR . '/advanced-cache.php';
</span><span class="cx">
</span><ins>+// Define WP_LANG_DIR if not set.
</ins><span class="cx"> wp_set_lang_dir();
</span><span class="cx">
</span><del>-require (ABSPATH . WPINC . '/compat.php');
-require (ABSPATH . WPINC . '/functions.php');
-require (ABSPATH . WPINC . '/classes.php');
</del><ins>+// Include early WordPress files.
+require( ABSPATH . WPINC . '/compat.php' );
+require( ABSPATH . WPINC . '/functions.php' );
+require( ABSPATH . WPINC . '/classes.php' );
</ins><span class="cx">
</span><ins>+// Include the wpdb class, or a db.php database drop-in if present.
</ins><span class="cx"> require_wp_db();
</span><span class="cx">
</span><ins>+// Set the database table prefix and the format specifiers for database table columns.
</ins><span class="cx"> wp_set_wpdb_vars();
</span><span class="cx">
</span><ins>+// Start the WordPress object cache, or an external object cache if the drop-in is present.
</ins><span class="cx"> wp_start_object_cache();
</span><span class="cx">
</span><ins>+// Initialize multisite if enabled.
</ins><span class="cx"> if ( is_multisite() )
</span><del>- require (ABSPATH . WPINC . '/ms-load.php');
</del><ins>+ require( ABSPATH . WPINC . '/ms-load.php' );
</ins><span class="cx">
</span><del>-require (ABSPATH . WPINC . '/plugin.php');
-require (ABSPATH . WPINC . '/default-filters.php');
-include_once(ABSPATH . WPINC . '/pomo/mo.php');
</del><ins>+// Load early WordPress files.
+require( ABSPATH . WPINC . '/plugin.php' );
+require( ABSPATH . WPINC . '/default-filters.php' );
+include_once( ABSPATH . WPINC . '/pomo/mo.php' );
</ins><span class="cx">
</span><del>-if ( SHORTINIT ) // stop most of WP being loaded, we just want the basics
</del><ins>+// Stop most of WordPress from being loaded if we just want the basics.
+if ( SHORTINIT )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>-require_once (ABSPATH . WPINC . '/l10n.php');
</del><ins>+// Load the l18n library.
+require_once ( ABSPATH . WPINC . '/l10n.php' );
</ins><span class="cx">
</span><ins>+// Run the installer if WordPress is not installed.
</ins><span class="cx"> wp_not_installed();
</span><span class="cx">
</span><del>-require (ABSPATH . WPINC . '/formatting.php');
-require (ABSPATH . WPINC . '/capabilities.php');
-require (ABSPATH . WPINC . '/query.php');
-require (ABSPATH . WPINC . '/theme.php');
-require (ABSPATH . WPINC . '/user.php');
-require (ABSPATH . WPINC . '/meta.php');
-require (ABSPATH . WPINC . '/general-template.php');
-require (ABSPATH . WPINC . '/link-template.php');
-require (ABSPATH . WPINC . '/author-template.php');
-require (ABSPATH . WPINC . '/post.php');
-require (ABSPATH . WPINC . '/post-template.php');
-require (ABSPATH . WPINC . '/category.php');
-require (ABSPATH . WPINC . '/category-template.php');
-require (ABSPATH . WPINC . '/comment.php');
-require (ABSPATH . WPINC . '/comment-template.php');
-require (ABSPATH . WPINC . '/rewrite.php');
-require (ABSPATH . WPINC . '/feed.php');
-require (ABSPATH . WPINC . '/bookmark.php');
-require (ABSPATH . WPINC . '/bookmark-template.php');
-require (ABSPATH . WPINC . '/kses.php');
-require (ABSPATH . WPINC . '/cron.php');
-require (ABSPATH . WPINC . '/deprecated.php');
-require (ABSPATH . WPINC . '/script-loader.php');
-require (ABSPATH . WPINC . '/taxonomy.php');
-require (ABSPATH . WPINC . '/update.php');
-require (ABSPATH . WPINC . '/canonical.php');
-require (ABSPATH . WPINC . '/shortcodes.php');
-require (ABSPATH . WPINC . '/media.php');
-require (ABSPATH . WPINC . '/http.php');
-require (ABSPATH . WPINC . '/widgets.php');
</del><ins>+// Load most of WordPress.
+require( ABSPATH . WPINC . '/formatting.php' );
+require( ABSPATH . WPINC . '/capabilities.php' );
+require( ABSPATH . WPINC . '/query.php' );
+require( ABSPATH . WPINC . '/theme.php' );
+require( ABSPATH . WPINC . '/user.php' );
+require( ABSPATH . WPINC . '/meta.php' );
+require( ABSPATH . WPINC . '/general-template.php' );
+require( ABSPATH . WPINC . '/link-template.php' );
+require( ABSPATH . WPINC . '/author-template.php' );
+require( ABSPATH . WPINC . '/post.php' );
+require( ABSPATH . WPINC . '/post-template.php' );
+require( ABSPATH . WPINC . '/category.php' );
+require( ABSPATH . WPINC . '/category-template.php' );
+require( ABSPATH . WPINC . '/comment.php' );
+require( ABSPATH . WPINC . '/comment-template.php' );
+require( ABSPATH . WPINC . '/rewrite.php' );
+require( ABSPATH . WPINC . '/feed.php' );
+require( ABSPATH . WPINC . '/bookmark.php' );
+require( ABSPATH . WPINC . '/bookmark-template.php' );
+require( ABSPATH . WPINC . '/kses.php' );
+require( ABSPATH . WPINC . '/cron.php' );
+require( ABSPATH . WPINC . '/deprecated.php' );
+require( ABSPATH . WPINC . '/script-loader.php' );
+require( ABSPATH . WPINC . '/taxonomy.php' );
+require( ABSPATH . WPINC . '/update.php' );
+require( ABSPATH . WPINC . '/canonical.php' );
+require( ABSPATH . WPINC . '/shortcodes.php' );
+require( ABSPATH . WPINC . '/media.php' );
+require( ABSPATH . WPINC . '/http.php' );
+require( ABSPATH . WPINC . '/widgets.php' );
</ins><span class="cx">
</span><ins>+// Load multisite-specific files.
</ins><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> require_once( ABSPATH . WPINC . '/ms-functions.php' );
</span><span class="cx"> require_once( ABSPATH . WPINC . '/ms-default-filters.php' );
</span><span class="cx"> require_once( ABSPATH . WPINC . '/ms-deprecated.php' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-wp_default_constants('wp_included');
</del><ins>+// Define constants that rely on the API to obtain the default value.
+wp_default_constants( 'wp_included' );
</ins><span class="cx">
</span><ins>+// Set up multisite if enabled.
</ins><span class="cx"> if ( is_multisite() )
</span><del>- ms_network_settings();
</del><ins>+ ms_network_settings();
</ins><span class="cx">
</span><del>-wp_default_constants('ms_network_settings_loaded');
</del><ins>+// Define must-use plugin directory constants, which may be overridden in the sunrise.php drop-in.
+wp_default_constants( 'ms_network_settings_loaded' );
</ins><span class="cx">
</span><del>-wp_load_mu_plugins();
</del><ins>+// Load must-use plugins.
+foreach( wp_muplugins_to_load() as $mu_plugin )
+ include_once( $mu_plugin );
+unset( $mu_plugin );
</ins><span class="cx">
</span><del>-/**
- * Used to load network wide plugins
- * @since 3.0
- */
-if ( is_multisite() )
- ms_network_plugins();
</del><ins>+// Load network-wide plugins if multisite.
+if ( is_multisite() ) {
+ foreach ( ms_network_plugins() as $plugin_file )
+ include_once( $plugin_file );
+ unset( $plugin_file );
+}
</ins><span class="cx">
</span><del>-do_action('muplugins_loaded');
</del><ins>+do_action( 'muplugins_loaded' );
</ins><span class="cx">
</span><del>-/**
- * Used to check site status
- * @since 3.0
- */
</del><ins>+// Check site status if multisite.
</ins><span class="cx"> if ( is_multisite() ) {
</span><del>- ms_site_check();
</del><ins>+ if ( true !== ( $file = ms_site_check() ) ) {
+ require_once( $file );
+ die();
+ }
</ins><span class="cx"> ms_network_cookies();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-wp_default_constants('ms_loaded');
</del><ins>+// Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
+wp_default_constants( 'ms_loaded' );
</ins><span class="cx">
</span><del>-require (ABSPATH . WPINC . '/vars.php');
</del><ins>+// Create common globals.
+require( ABSPATH . WPINC . '/vars.php' );
</ins><span class="cx">
</span><del>-// make taxonomies available to plugins and themes
-// @plugin authors: warning: this gets registered again on the init hook
</del><ins>+// Make taxonomies available to plugins and themes.
+// @plugin authors: warning: this gets registered again on the init hook.
</ins><span class="cx"> create_initial_taxonomies();
</span><span class="cx">
</span><del>-wp_load_plugins();
</del><ins>+// Load active plugins.
+foreach( wp_plugins_to_load() as $plugin )
+ include_once( $plugin );
+unset( $plugin );
</ins><span class="cx">
</span><del>-require (ABSPATH . WPINC . '/pluggable.php');
</del><ins>+// Load pluggable functions.
+require( ABSPATH . WPINC . '/pluggable.php' );
</ins><span class="cx">
</span><ins>+// Set internal encoding.
</ins><span class="cx"> wp_set_internal_encoding();
</span><span class="cx">
</span><del>-if ( WP_CACHE && function_exists('wp_cache_postload') )
</del><ins>+// Run wp_cache_postload() if object cache is enabled and the function exists.
+if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
</ins><span class="cx"> wp_cache_postload();
</span><span class="cx">
</span><del>-do_action('plugins_loaded');
</del><ins>+do_action( 'plugins_loaded' );
</ins><span class="cx">
</span><del>-wp_default_constants('plugins_loaded');
</del><ins>+// Define WP_POST_REVISIONS if not already defined.
+wp_default_constants( 'plugins_loaded' );
</ins><span class="cx">
</span><ins>+// Add magic quotes and set up $_REQUEST ( $_GET + $_POST )
</ins><span class="cx"> wp_magic_quotes();
</span><span class="cx">
</span><del>-do_action('sanitize_comment_cookies');
</del><ins>+do_action( 'sanitize_comment_cookies' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Query object
</span><span class="lines">@@ -173,21 +212,21 @@
</span><span class="cx"> * @global object $wp_query
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> */
</span><del>-$wp_query =& $wp_the_query;
</del><ins>+$wp_query =& $wp_the_query;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress Rewrite object for creating pretty URLs
</span><span class="cx"> * @global object $wp_rewrite
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> */
</span><del>-$wp_rewrite =& new WP_Rewrite();
</del><ins>+$wp_rewrite =& new WP_Rewrite();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Object
</span><span class="cx"> * @global object $wp
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> */
</span><del>-$wp =& new WP();
</del><ins>+$wp =& new WP();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Widget Factory Object
</span><span class="lines">@@ -196,15 +235,23 @@
</span><span class="cx"> */
</span><span class="cx"> $wp_widget_factory =& new WP_Widget_Factory();
</span><span class="cx">
</span><del>-do_action('setup_theme');
</del><ins>+do_action( 'setup_theme' );
</ins><span class="cx">
</span><del>-wp_default_constants('setup_theme');
</del><ins>+// Define the TEMPLATEPATH and STYLESHEETPATH constants.
+wp_default_constants( 'setup_theme' );
</ins><span class="cx">
</span><span class="cx"> // Load the default text localization domain.
</span><span class="cx"> load_default_textdomain();
</span><span class="cx">
</span><del>-wp_find_locale();
</del><ins>+// Find the blog locale.
+$locale = get_locale();
+$locale_file = WP_LANG_DIR . "/$locale.php";
+if ( is_readable( $locale_file ) )
+ require_once( $locale_file );
</ins><span class="cx">
</span><ins>+// Pull in locale data after loading text domain.
+require_once( ABSPATH . WPINC . '/locale.php' );
+
</ins><span class="cx"> /**
</span><span class="cx"> * WordPress Locale object for loading locale domain date and various strings.
</span><span class="cx"> * @global object $wp_locale
</span><span class="lines">@@ -212,13 +259,21 @@
</span><span class="cx"> */
</span><span class="cx"> $wp_locale =& new WP_Locale();
</span><span class="cx">
</span><del>-wp_load_theme_functions();
</del><ins>+// 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' );
</ins><span class="cx">
</span><del>-register_shutdown_function('shutdown_action_hook');
</del><ins>+// Load any template functions the theme supports.
+require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
</ins><span class="cx">
</span><del>-$wp->init(); // Sets up current user.
</del><ins>+register_shutdown_function( 'shutdown_action_hook' );
</ins><span class="cx">
</span><ins>+// Set up current user.
+$wp->init();
+
</ins><span class="cx"> // Everything is loaded and initialized.
</span><del>-do_action('init');
</del><ins>+do_action( 'init' );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>