<!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>[12732] trunk: Cleanup wp-settings.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12732">12732</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-15 22:03:41 +0000 (Fri, 15 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup wp-settings. Move functions needed at startup into load.php. Props nacin. see <a href="http://trac.wordpress.org/ticket/11881">#11881</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultconstantsphp">trunk/wp-includes/default-constants.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (12731 => 12732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2010-01-15 20:21:18 UTC (rev 12731)
+++ trunk/wp-admin/setup-config.php 2010-01-15 22:03:41 UTC (rev 12732)
</span><span class="lines">@@ -31,8 +31,10 @@
</span><span class="cx"> define('ABSPATH', dirname(dirname(__FILE__)).'/');
</span><span class="cx"> define('WPINC', 'wp-includes');
</span><span class="cx"> define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
</span><ins>+define('WP_DEBUG', false);
</ins><span class="cx"> /**#@-*/
</span><span class="cx">
</span><ins>+require_once(ABSPATH . WPINC . '/load.php');
</ins><span class="cx"> require_once(ABSPATH . WPINC . '/compat.php');
</span><span class="cx"> require_once(ABSPATH . WPINC . '/functions.php');
</span><span class="cx"> require_once(ABSPATH . WPINC . '/classes.php');
</span></span></pre></div>
<a id="trunkwpincludesdefaultconstantsphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/default-constants.php (0 => 12732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-constants.php (rev 0)
+++ trunk/wp-includes/default-constants.php 2010-01-15 22:03:41 UTC (rev 12732)
</span><span class="lines">@@ -0,0 +1,279 @@
</span><ins>+<?php
+
+/**
+ * Defines constants and global variables that can be overridden, generally in wp-config.php.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Defines WordPress default constants.
+ *
+ * @since 3.0.0
+ * @param $context
+ */
+function wp_default_constants( $context ) {
+
+ switch( $context ) {
+
+ case 'init' :
+
+ // set memory limits
+ if ( !defined('WP_MEMORY_LIMIT') ) {
+ if( is_multisite() ) {
+ define('WP_MEMORY_LIMIT', '64M');
+ } else {
+ define('WP_MEMORY_LIMIT', '32M');
+ }
+ }
+
+ /**
+ * The $blog_id global, which you can change in the config allows you to create a simple
+ * multiple blog installation using just one WordPress and changing $blog_id around.
+ *
+ * @global int $blog_id
+ * @since 2.0.0
+ */
+ if ( ! isset($blog_id) )
+ $blog_id = 1;
+
+ // set memory limits.
+ if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < abs(intval(WP_MEMORY_LIMIT)) ) )
+ @ini_set('memory_limit', WP_MEMORY_LIMIT);
+
+ if ( !defined('WP_CONTENT_DIR') )
+ define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
+
+ // Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
+ if ( !defined('WP_DEBUG') )
+ define( 'WP_DEBUG', false );
+
+ // Add define('WP_DEBUG_DISPLAY', false); to wp-config.php to use the globally configured setting for display_errors and not force it to On
+ if ( !defined('WP_DEBUG_DISPLAY') )
+ define( 'WP_DEBUG_DISPLAY', true );
+
+ // Add define('WP_DEBUG_LOG', true); to enable php debug logging to WP_CONTENT_DIR/debug.log
+ if ( !defined('WP_DEBUG_LOG') )
+ define('WP_DEBUG_LOG', false);
+
+ if ( !defined('WP_CACHE') )
+ define('WP_CACHE', false);
+
+ /**
+ * Private
+ */
+ if ( !defined('MEDIA_TRASH') )
+ define('MEDIA_TRASH', false);
+
+ if ( !defined('SHORTINIT') )
+ define('SHORTINIT', false);
+ break;
+
+ case 'wp_included':
+
+ if ( !defined('WP_CONTENT_URL') )
+ define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
+
+ /**
+ * Allows for the plugins directory to be moved from the default location.
+ *
+ * @since 2.6.0
+ */
+ if ( !defined('WP_PLUGIN_DIR') )
+ define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash
+
+ /**
+ * Allows for the plugins directory to be moved from the default location.
+ *
+ * @since 2.6.0
+ */
+ if ( !defined('WP_PLUGIN_URL') )
+ define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash
+
+ /**
+ * Allows for the plugins directory to be moved from the default location.
+ *
+ * @since 2.1.0
+ */
+ if ( !defined('PLUGINDIR') )
+ define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
+ break;
+
+ case 'ms_network_settings_loaded':
+
+ /**
+ * Allows for the mu-plugins directory to be moved from the default location.
+ *
+ * @since 2.8.0
+ */
+ if ( !defined('WPMU_PLUGIN_DIR') )
+ define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash
+
+ /**
+ * Allows for the mu-plugins directory to be moved from the default location.
+ *
+ * @since 2.8.0
+ */
+ if ( !defined('WPMU_PLUGIN_URL') )
+ define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash
+
+ /**
+ * Allows for the mu-plugins directory to be moved from the default location.
+ *
+ * @since 2.8.0
+ */
+ if ( !defined( 'MUPLUGINDIR' ) )
+ define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
+ break;
+
+ case 'ms_loaded';
+
+ global $wp_default_secret_key;
+
+ /**
+ * Used to guarantee unique hash cookies
+ * @since 1.5
+ */
+ if( !defined('COOKIEHASH') )
+ define('COOKIEHASH', md5(get_option('siteurl')));
+
+ /**
+ * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php
+ * @since 2.5.0
+ */
+ $wp_default_secret_key = 'put your unique phrase here';
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.0.0
+ */
+ if ( !defined('USER_COOKIE') )
+ define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH);
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.0.0
+ */
+ if ( !defined('PASS_COOKIE') )
+ define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH);
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.5.0
+ */
+ if ( !defined('AUTH_COOKIE') )
+ define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.6.0
+ */
+ if ( !defined('SECURE_AUTH_COOKIE') )
+ define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.6.0
+ */
+ if ( !defined('LOGGED_IN_COOKIE') )
+ define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.3.0
+ */
+ if ( !defined('TEST_COOKIE') )
+ define('TEST_COOKIE', 'wordpress_test_cookie');
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 1.2.0
+ */
+ if ( !defined('COOKIEPATH') )
+ define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 1.5.0
+ */
+ if ( !defined('SITECOOKIEPATH') )
+ define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.6.0
+ */
+ if ( !defined('ADMIN_COOKIE_PATH') )
+ define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.6.0
+ */
+ if ( !defined('PLUGINS_COOKIE_PATH') )
+ define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL) );
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.0.0
+ */
+ if ( !defined('COOKIE_DOMAIN') )
+ define('COOKIE_DOMAIN', false);
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.6.0
+ */
+ if ( !defined('FORCE_SSL_ADMIN') )
+ define('FORCE_SSL_ADMIN', false);
+ force_ssl_admin(FORCE_SSL_ADMIN);
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.6.0
+ */
+ if ( !defined('FORCE_SSL_LOGIN') )
+ define('FORCE_SSL_LOGIN', false);
+ force_ssl_login(FORCE_SSL_LOGIN);
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.5.0
+ */
+ if ( !defined( 'AUTOSAVE_INTERVAL' ) )
+ define( 'AUTOSAVE_INTERVAL', 60 );
+
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.9.0
+ */
+ if ( !defined( 'EMPTY_TRASH_DAYS' ) )
+ define( 'EMPTY_TRASH_DAYS', 30 );
+ break;
+
+ case 'plugins_loaded':
+
+ if ( !defined('WP_POST_REVISIONS') )
+ define('WP_POST_REVISIONS', true);
+ break;
+
+ case 'setup_theme':
+
+ /**
+ * Web Path to the current active template directory
+ * @since 1.5.0
+ */
+ define('TEMPLATEPATH', get_template_directory());
+
+ /**
+ * Web Path to the current active template stylesheet directory
+ * @since 2.1.0
+ */
+ define('STYLESHEETPATH', get_stylesheet_directory());
+ break;
+
+ }
+
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-includes/default-constants.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/load.php (0 => 12732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php (rev 0)
+++ trunk/wp-includes/load.php 2010-01-15 22:03:41 UTC (rev 12732)
</span><span class="lines">@@ -0,0 +1,449 @@
</span><ins>+<?php
+
+/**
+ * These functions are needed to load WordPress.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Turn register globals off.
+ *
+ * @access private
+ * @since 2.1.0
+ * @return null Will return null if register_globals PHP directive was disabled
+ */
+function wp_unregister_GLOBALS() {
+ if ( !ini_get('register_globals') )
+ return;
+
+ if ( isset($_REQUEST['GLOBALS']) )
+ die('GLOBALS overwrite attempt detected');
+
+ // Variables that shouldn't be unset
+ $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
+
+ $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
+ foreach ( $input as $k => $v )
+ if ( !in_array($k, $noUnset) && isset($GLOBALS[$k]) ) {
+ $GLOBALS[$k] = NULL;
+ unset($GLOBALS[$k]);
+ }
+}
+
+function wp_fix_server_vars() {
+ global $PHP_SELF;
+ // Fix for IIS when running with PHP ISAPI
+ if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
+
+ // IIS Mod-Rewrite
+ if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
+ $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
+ }
+ // IIS Isapi_Rewrite
+ else if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
+ $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
+ }
+ else
+ {
+ // Use ORIG_PATH_INFO if there is no PATH_INFO
+ if ( !isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']) )
+ $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+
+ // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
+ if ( isset($_SERVER['PATH_INFO']) ) {
+ if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
+ $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
+ else
+ $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+ }
+
+ // Append the query string if it exists and isn't null
+ if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
+ $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+ }
+ }
+ }
+
+ // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
+ if ( isset($_SERVER['SCRIPT_FILENAME']) && ( strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7 ) )
+ $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
+
+ // Fix for Dreamhost and other PHP as CGI hosts
+ if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
+ unset($_SERVER['PATH_INFO']);
+
+ // Fix empty PHP_SELF
+ $PHP_SELF = $_SERVER['PHP_SELF'];
+ if ( empty($PHP_SELF) )
+ $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
+}
+
+function wp_check_php_mysql_versions() {
+ // we can probably extend this function to check if wp_die() exists then use translated strings, and then use it in install.php etc.
+
+ global $required_php_version, $wp_version;
+ $php_version = phpversion();
+ if ( version_compare( $required_php_version, $php_version, '>' ) )
+ 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 ) );
+
+ if ( !extension_loaded('mysql') && !file_exists(WP_CONTENT_DIR . '/db.php') )
+ die( /*WP_I18N_OLD_MYSQL*/'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'/*/WP_I18N_OLD_MYSQL*/ );
+}
+
+function wp_maintenance() {
+ 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();
+ }
+
+ $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' );
+ ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Maintenance</title>
+
+ </head>
+ <body>
+ <h1>Briefly unavailable for scheduled maintenance. Check back in a minute.</h1>
+ </body>
+ </html>
+ <?php
+ die();
+ }
+ }
+}
+
+/**
+ * PHP 4 standard microtime start capture.
+ *
+ * @access private
+ * @since 0.71
+ * @global int $timestart Seconds and Microseconds added together from when function is called.
+ * @return bool Always returns true.
+ */
+function timer_start() {
+ global $timestart;
+ $mtime = explode(' ', microtime() );
+ $mtime = $mtime[1] + $mtime[0];
+ $timestart = $mtime;
+ return true;
+}
+
+/**
+ * Return and/or display the time from the page start to when function is called.
+ *
+ * You can get the results and print them by doing:
+ * <code>
+ * $nTimePageTookToExecute = timer_stop();
+ * echo $nTimePageTookToExecute;
+ * </code>
+ *
+ * Or instead, you can do:
+ * <code>
+ * timer_stop(1);
+ * </code>
+ * which will do what the above does. If you need the result, you can assign it to a variable, but
+ * most cases, you only need to echo it.
+ *
+ * @since 0.71
+ * @global int $timestart Seconds and Microseconds added together from when timer_start() is called
+ * @global int $timeend Seconds and Microseconds added together from when function is called
+ *
+ * @param int $display Use '0' or null to not echo anything and 1 to echo the total time
+ * @param int $precision The amount of digits from the right of the decimal to display. Default is 3.
+ * @return float The "second.microsecond" finished time calculation
+ */
+function timer_stop($display = 0, $precision = 3) { //if called like timer_stop(1), will echo $timetotal
+ global $timestart, $timeend;
+ $mtime = microtime();
+ $mtime = explode(' ',$mtime);
+ $mtime = $mtime[1] + $mtime[0];
+ $timeend = $mtime;
+ $timetotal = $timeend-$timestart;
+ $r = ( function_exists('number_format_i18n') ) ? number_format_i18n($timetotal, $precision) : number_format($timetotal, $precision);
+ if ( $display )
+ echo $r;
+ return $r;
+}
+
+function wp_debug_mode() {
+ if ( WP_DEBUG ) {
+ if ( defined('E_DEPRECATED') )
+ error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
+ else
+ error_reporting(E_ALL);
+
+ if ( WP_DEBUG_DISPLAY )
+ ini_set('display_errors', 1);
+
+ if ( WP_DEBUG_LOG ) {
+ ini_set('log_errors', 1);
+ ini_set('error_log', WP_CONTENT_DIR . '/debug.log');
+ }
+ } else {
+ if ( defined('E_RECOVERABLE_ERROR') )
+ error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
+ else
+ error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
+ }
+}
+
+function wp_set_lang_dir() {
+ 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')) {
+ // Old static relative path maintained for limited backwards compatibility - won't work in some cases
+ define('LANGDIR', 'wp-content/languages');
+ }
+ } else {
+ define('WP_LANG_DIR', ABSPATH . WPINC . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
+ if (!defined('LANGDIR')) {
+ // Old relative path maintained for backwards compatibility
+ define('LANGDIR', WPINC . '/languages');
+ }
+ }
+ }
+}
+
+function wp_set_wpdb_vars() {
+ global $wpdb, $table_prefix;
+ if ( !empty($wpdb->error) )
+ dead_db();
+
+ /**
+ * 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()
+ */
+ $wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
+ 'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'commment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
+ 'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
+ 'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d');
+
+ $prefix = $wpdb->set_prefix($table_prefix);
+
+ 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*/);
+
+}
+
+function wp_start_object_cache() {
+ global $_wp_using_ext_object_cache;
+ if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
+ require_once (WP_CONTENT_DIR . '/object-cache.php');
+ $_wp_using_ext_object_cache = true;
+ } else {
+ require_once (ABSPATH . WPINC . '/cache.php');
+ $_wp_using_ext_object_cache = false;
+ }
+
+ wp_cache_init();
+ if ( function_exists('wp_cache_add_global_groups') ) {
+ if( is_multisite() ) {
+ wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
+ } else {
+ wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient'));
+ }
+ wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
+ }
+}
+
+function wp_not_installed() {
+ if( is_multisite() ) {
+ 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 ~ Mark
+ }
+ } elseif ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
+ if ( defined('WP_SITEURL') )
+ $link = WP_SITEURL . '/wp-admin/install.php';
+ elseif (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
+ $link = preg_replace('|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF']) . 'wp-admin/install.php';
+ else
+ $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);
+ die();
+ }
+}
+
+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 );
+ if( is_multisite() )
+ sort( $mu_plugins );
+ foreach( $mu_plugins as $mu_plugin )
+ include_once( WPMU_PLUGIN_DIR . '/' . $mu_plugin );
+ }
+ }
+}
+
+function wp_load_plugins() {
+ // Check for hacks file if the option is enabled
+ if ( get_option('hack_file') ) {
+ if ( file_exists(ABSPATH . 'my-hacks.php') )
+ require(ABSPATH . 'my-hacks.php');
+ }
+
+ $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);
+ }
+ unset($current_plugins);
+
+}
+
+function wp_set_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
+ */
+ if (function_exists('mb_internal_encoding')) {
+ if (!@mb_internal_encoding(get_option('blog_charset')))
+ mb_internal_encoding('UTF-8');
+ }
+}
+
+function wp_magic_quotes() {
+ // If already slashed, strip.
+ if ( get_magic_quotes_gpc() ) {
+ $_GET = stripslashes_deep($_GET );
+ $_POST = stripslashes_deep($_POST );
+ $_COOKIE = stripslashes_deep($_COOKIE);
+ }
+
+ // Escape with wpdb.
+ $_GET = add_magic_quotes($_GET );
+ $_POST = add_magic_quotes($_POST );
+ $_COOKIE = add_magic_quotes($_COOKIE);
+ $_SERVER = add_magic_quotes($_SERVER);
+
+ // Force REQUEST to be GET + POST. If SERVER, COOKIE, or ENV are needed, use those superglobals directly.
+ $_REQUEST = array_merge($_GET, $_POST);
+}
+
+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' );
+}
+
+/**
+ * Runs just before PHP shuts down execution.
+ *
+ * @access private
+ * @since 1.2.0
+ */
+function shutdown_action_hook() {
+ do_action('shutdown');
+ wp_cache_close();
+}
+
+/**
+ * Copy an object.
+ *
+ * Returns a cloned copy of an object.
+ *
+ * @since 2.7.0
+ *
+ * @param object $object The object to clone
+ * @return object The cloned object
+ */
+function wp_clone( $object ) {
+ static $can_clone;
+ if ( !isset( $can_clone ) ) {
+ $can_clone = version_compare( phpversion(), '5.0', '>=' );
+ }
+ return $can_clone ? clone( $object ) : $object;
+}
+
+/**
+ * Whether the current request is in WordPress admin Panel
+ *
+ * Does not inform on whether the user is an admin! Use capability checks to
+ * tell if the user should be accessing a section or not.
+ *
+ * @since 1.5.1
+ *
+ * @return bool True if inside WordPress administration pages.
+ */
+function is_admin() {
+ if ( defined('WP_ADMIN') )
+ return WP_ADMIN;
+ return false;
+}
+
+/**
+ * Whether Multisite support is enabled
+ *
+ * @since 3.0
+ *
+ * @return bool True if multisite is enabled, false otherwise.
+ */
+function is_multisite() {
+ if ( ( defined('MULTISITE') && MULTISITE ) || defined('VHOST') || defined('SUNRISE') )
+ return true;
+
+ return false;
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-includes/load.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (12731 => 12732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-01-15 20:21:18 UTC (rev 12731)
+++ trunk/wp-settings.php 2010-01-15 22:03:41 UTC (rev 12732)
</span><span class="lines">@@ -3,396 +3,73 @@
</span><span class="cx"> * Used to setup and fix common variables and include
</span><span class="cx"> * the WordPress procedural and class library.
</span><span class="cx"> *
</span><del>- * You should not have to change this file and allows
- * for some configuration in wp-config.php.
</del><ins>+ * Allows for some configuration in wp-config.php (see default-constants.php)
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><del>- * Whether Multisite support is enabled
</del><ins>+ * Stores the location of the WordPress directory of functions, classes, and core content.
</ins><span class="cx"> *
</span><del>- * @since 3.0
- *
- * @return bool True if multisite is enabled, false otherwise.
</del><ins>+ * @since 1.0.0
</ins><span class="cx"> */
</span><del>-function is_multisite() {
- if ( ( defined('MULTISITE') && MULTISITE ) || defined('VHOST') || defined('SUNRISE') )
- return true;
</del><ins>+define('WPINC', 'wp-includes');
</ins><span class="cx">
</span><del>- return false;
-}
</del><ins>+require (ABSPATH . WPINC . '/load.php');
+require (ABSPATH . WPINC . '/default-constants.php');
+require (ABSPATH . WPINC . '/version.php');
</ins><span class="cx">
</span><del>-if ( !defined('WP_MEMORY_LIMIT') ) {
- if( is_multisite() ) {
- define('WP_MEMORY_LIMIT', '64M');
- } else {
- define('WP_MEMORY_LIMIT', '32M');
- }
-}
</del><ins>+wp_default_constants('init');
</ins><span class="cx">
</span><del>-if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < abs(intval(WP_MEMORY_LIMIT)) ) )
- @ini_set('memory_limit', WP_MEMORY_LIMIT);
-
</del><span class="cx"> set_magic_quotes_runtime(0);
</span><span class="cx"> @ini_set('magic_quotes_sybase', 0);
</span><span class="cx">
</span><span class="cx"> if ( function_exists('date_default_timezone_set') )
</span><span class="cx"> date_default_timezone_set('UTC');
</span><span class="cx">
</span><del>-/**
- * Turn register globals off.
- *
- * @access private
- * @since 2.1.0
- * @return null Will return null if register_globals PHP directive was disabled
- */
-function wp_unregister_GLOBALS() {
- if ( !ini_get('register_globals') )
- return;
-
- if ( isset($_REQUEST['GLOBALS']) )
- die('GLOBALS overwrite attempt detected');
-
- // Variables that shouldn't be unset
- $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
-
- $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
- foreach ( $input as $k => $v )
- if ( !in_array($k, $noUnset) && isset($GLOBALS[$k]) ) {
- $GLOBALS[$k] = NULL;
- unset($GLOBALS[$k]);
- }
-}
-
</del><span class="cx"> wp_unregister_GLOBALS();
</span><span class="cx">
</span><span class="cx"> unset( $wp_filter, $cache_lastcommentmodified, $cache_lastpostdate );
</span><span class="cx">
</span><del>-/**
- * The $blog_id global, which you can change in the config allows you to create a simple
- * multiple blog installation using just one WordPress and changing $blog_id around.
- *
- * @global int $blog_id
- * @since 2.0.0
- */
-if ( ! isset($blog_id) )
- $blog_id = 1;
</del><ins>+wp_fix_server_vars();
</ins><span class="cx">
</span><del>-// Fix for IIS when running with PHP ISAPI
-if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
</del><ins>+wp_check_php_mysql_versions();
</ins><span class="cx">
</span><del>- // IIS Mod-Rewrite
- if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
- $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
- }
- // IIS Isapi_Rewrite
- else if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
- $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
- }
- else
- {
- // Use ORIG_PATH_INFO if there is no PATH_INFO
- if ( !isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']) )
- $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
</del><ins>+wp_maintenance();
</ins><span class="cx">
</span><del>- // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
- if ( isset($_SERVER['PATH_INFO']) ) {
- if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
- $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
- else
- $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
- }
-
- // Append the query string if it exists and isn't null
- if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
- $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
- }
- }
-}
-
-// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-if ( isset($_SERVER['SCRIPT_FILENAME']) && ( strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7 ) )
- $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
-
-// Fix for Dreamhost and other PHP as CGI hosts
-if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
- unset($_SERVER['PATH_INFO']);
-
-// Fix empty PHP_SELF
-$PHP_SELF = $_SERVER['PHP_SELF'];
-if ( empty($PHP_SELF) )
- $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
-
-if ( version_compare( '4.3', phpversion(), '>' ) ) {
- die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %s but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/, phpversion() ) );
-}
-
-if ( !defined('WP_CONTENT_DIR') )
- define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
-
-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();
- }
-
- $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' );
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>Maintenance</title>
-
-</head>
-<body>
- <h1>Briefly unavailable for scheduled maintenance. Check back in a minute.</h1>
-</body>
-</html>
-<?php
- die();
- }
-}
-
-if ( !extension_loaded('mysql') && !file_exists(WP_CONTENT_DIR . '/db.php') )
- die( /*WP_I18N_OLD_MYSQL*/'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'/*/WP_I18N_OLD_MYSQL*/ );
-
-/**
- * PHP 4 standard microtime start capture.
- *
- * @access private
- * @since 0.71
- * @global int $timestart Seconds and Microseconds added together from when function is called.
- * @return bool Always returns true.
- */
-function timer_start() {
- global $timestart;
- $mtime = explode(' ', microtime() );
- $mtime = $mtime[1] + $mtime[0];
- $timestart = $mtime;
- return true;
-}
-
-/**
- * Return and/or display the time from the page start to when function is called.
- *
- * You can get the results and print them by doing:
- * <code>
- * $nTimePageTookToExecute = timer_stop();
- * echo $nTimePageTookToExecute;
- * </code>
- *
- * Or instead, you can do:
- * <code>
- * timer_stop(1);
- * </code>
- * which will do what the above does. If you need the result, you can assign it to a variable, but
- * most cases, you only need to echo it.
- *
- * @since 0.71
- * @global int $timestart Seconds and Microseconds added together from when timer_start() is called
- * @global int $timeend Seconds and Microseconds added together from when function is called
- *
- * @param int $display Use '0' or null to not echo anything and 1 to echo the total time
- * @param int $precision The amount of digits from the right of the decimal to display. Default is 3.
- * @return float The "second.microsecond" finished time calculation
- */
-function timer_stop($display = 0, $precision = 3) { //if called like timer_stop(1), will echo $timetotal
- global $timestart, $timeend;
- $mtime = microtime();
- $mtime = explode(' ',$mtime);
- $mtime = $mtime[1] + $mtime[0];
- $timeend = $mtime;
- $timetotal = $timeend-$timestart;
- $r = ( function_exists('number_format_i18n') ) ? number_format_i18n($timetotal, $precision) : number_format($timetotal, $precision);
- if ( $display )
- echo $r;
- return $r;
-}
</del><span class="cx"> timer_start();
</span><span class="cx">
</span><del>-// Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
-if ( !defined('WP_DEBUG') )
- define( 'WP_DEBUG', false );
</del><ins>+wp_debug_mode();
</ins><span class="cx">
</span><del>-if ( WP_DEBUG ) {
- if ( defined('E_DEPRECATED') )
- error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
- else
- error_reporting(E_ALL);
- // Add define('WP_DEBUG_DISPLAY', false); to wp-config.php to use the globally configured setting for display_errors and not force it to On
- if ( ! defined('WP_DEBUG_DISPLAY') || WP_DEBUG_DISPLAY )
- ini_set('display_errors', 1);
- // Add define('WP_DEBUG_LOG', true); to enable php debug logging to WP_CONTENT_DIR/debug.log
- if ( defined('WP_DEBUG_LOG') && WP_DEBUG_LOG ) {
- ini_set('log_errors', 1);
- ini_set('error_log', WP_CONTENT_DIR . '/debug.log');
- }
-} else {
- if ( defined('E_RECOVERABLE_ERROR') )
- error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
- else
- error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
-}
-
</del><span class="cx"> // For an advanced caching plugin to use, static because you would only want one
</span><del>-if ( defined('WP_CACHE') && WP_CACHE )
</del><ins>+if ( WP_CACHE )
</ins><span class="cx"> @include WP_CONTENT_DIR . '/advanced-cache.php';
</span><span class="cx">
</span><del>-/**
- * Private
- */
-if ( !defined('MEDIA_TRASH') )
- define('MEDIA_TRASH', false);
</del><ins>+wp_set_lang_dir();
</ins><span class="cx">
</span><del>-/**
- * Stores the location of the WordPress directory of functions, classes, and core content.
- *
- * @since 1.0.0
- */
-define('WPINC', 'wp-includes');
-
-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')) {
- // Old static relative path maintained for limited backwards compatibility - won't work in some cases
- define('LANGDIR', 'wp-content/languages');
- }
- } else {
- define('WP_LANG_DIR', ABSPATH . WPINC . '/languages'); // no leading slash, no trailing slash, full path, not relative to ABSPATH
- if (!defined('LANGDIR')) {
- // Old relative path maintained for backwards compatibility
- define('LANGDIR', WPINC . '/languages');
- }
- }
-}
-
</del><span class="cx"> require (ABSPATH . WPINC . '/compat.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/functions.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/classes.php');
</span><span class="cx">
</span><span class="cx"> require_wp_db();
</span><span class="cx">
</span><del>-if ( !empty($wpdb->error) )
- dead_db();
</del><ins>+wp_set_wpdb_vars();
</ins><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()
- */
-$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
- 'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'commment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
- 'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
- 'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d');
</del><ins>+wp_start_object_cache();
</ins><span class="cx">
</span><del>-$prefix = $wpdb->set_prefix($table_prefix);
-
-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*/);
-
-/**
- * Copy an object.
- *
- * Returns a cloned copy of an object.
- *
- * @since 2.7.0
- *
- * @param object $object The object to clone
- * @return object The cloned object
- */
-function wp_clone( $object ) {
- static $can_clone;
- if ( !isset( $can_clone ) ) {
- $can_clone = version_compare( phpversion(), '5.0', '>=' );
- }
- return $can_clone ? clone( $object ) : $object;
-}
-
-/**
- * Whether the current request is in WordPress admin Panel
- *
- * Does not inform on whether the user is an admin! Use capability checks to
- * tell if the user should be accessing a section or not.
- *
- * @since 1.5.1
- *
- * @return bool True if inside WordPress administration pages.
- */
-function is_admin() {
- if ( defined('WP_ADMIN') )
- return WP_ADMIN;
- return false;
-}
-
-if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
- require_once (WP_CONTENT_DIR . '/object-cache.php');
- $_wp_using_ext_object_cache = true;
-} else {
- require_once (ABSPATH . WPINC . '/cache.php');
- $_wp_using_ext_object_cache = false;
-}
-
-wp_cache_init();
-if ( function_exists('wp_cache_add_global_groups') ) {
- if( is_multisite() ) {
- wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
- } else {
- wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient'));
- }
- wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
-}
-
-if( is_multisite() ) {
</del><ins>+if( is_multisite() )
</ins><span class="cx"> require (ABSPATH . WPINC . '/ms-load.php');
</span><del>-}
</del><span class="cx">
</span><span class="cx"> require (ABSPATH . WPINC . '/plugin.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/default-filters.php');
</span><span class="cx"> include_once(ABSPATH . WPINC . '/pomo/mo.php');
</span><span class="cx">
</span><del>-if( is_multisite() && defined( "SHORTINIT" ) && SHORTINIT ) // stop most of WP being loaded, we just want the basics
</del><ins>+if( is_multisite() && SHORTINIT ) // stop most of WP being loaded, we just want the basics
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> require_once (ABSPATH . WPINC . '/l10n.php');
</span><span class="cx">
</span><del>-if( is_multisite() ) {
- 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 ~ Mark
- }
-} elseif ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
- if ( defined('WP_SITEURL') )
- $link = WP_SITEURL . '/wp-admin/install.php';
- elseif (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
- $link = preg_replace('|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF']) . 'wp-admin/install.php';
- else
- $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);
- die(); // have to die here ~ Mark
-}
</del><ins>+wp_not_installed();
</ins><span class="cx">
</span><span class="cx"> require (ABSPATH . WPINC . '/formatting.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/capabilities.php');
</span><span class="lines">@@ -415,7 +92,6 @@
</span><span class="cx"> require (ABSPATH . WPINC . '/bookmark-template.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/kses.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/cron.php');
</span><del>-require (ABSPATH . WPINC . '/version.php');
</del><span class="cx"> require (ABSPATH . WPINC . '/deprecated.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/script-loader.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/taxonomy.php');
</span><span class="lines">@@ -432,85 +108,21 @@
</span><span class="cx"> require_once( ABSPATH . WPINC . '/ms-deprecated.php' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( !defined('WP_CONTENT_URL') )
- define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
</del><ins>+wp_default_constants('wp_included');
</ins><span class="cx">
</span><del>-/**
- * Allows for the plugins directory to be moved from the default location.
- *
- * @since 2.6.0
- */
-if ( !defined('WP_PLUGIN_DIR') )
- define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash
-
-/**
- * Allows for the plugins directory to be moved from the default location.
- *
- * @since 2.6.0
- */
-if ( !defined('WP_PLUGIN_URL') )
- define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash
-
-/**
- * Allows for the plugins directory to be moved from the default location.
- *
- * @since 2.1.0
- */
-if ( !defined('PLUGINDIR') )
- define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
-
</del><span class="cx"> if( is_multisite() )
</span><span class="cx"> ms_network_settings();
</span><del>-/**
- * Allows for the mu-plugins directory to be moved from the default location.
- *
- * @since 2.8.0
- */
-if ( !defined('WPMU_PLUGIN_DIR') )
- define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash
</del><span class="cx">
</span><del>-/**
- * Allows for the mu-plugins directory to be moved from the default location.
- *
- * @since 2.8.0
- */
-if ( !defined('WPMU_PLUGIN_URL') )
- define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash
</del><ins>+wp_default_constants('ms_network_settings_loaded');
</ins><span class="cx">
</span><del>-/**
- * Allows for the mu-plugins directory to be moved from the default location.
- *
- * @since 2.8.0
- */
-if ( !defined( 'MUPLUGINDIR' ) )
- define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
</del><ins>+wp_load_mu_plugins();
</ins><span class="cx">
</span><del>-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 );
-
- if( is_multisite() )
- sort( $mu_plugins );
-
- foreach( $mu_plugins as $mu_plugin ) {
- include_once( WPMU_PLUGIN_DIR . '/' . $mu_plugin );
- }
- }
-}
</del><span class="cx"> /**
</span><span class="cx"> * Used to load network wide plugins
</span><span class="cx"> * @since 3.0
</span><span class="cx"> */
</span><del>-if( is_multisite() ) {
</del><ins>+if( is_multisite() )
</ins><span class="cx"> ms_network_plugins();
</span><del>-}
</del><span class="cx">
</span><span class="cx"> do_action('muplugins_loaded');
</span><span class="cx">
</span><span class="lines">@@ -522,193 +134,30 @@
</span><span class="cx"> ms_site_check();
</span><span class="cx"> ms_network_cookies();
</span><span class="cx"> }
</span><del>-/**
- * Used to guarantee unique hash cookies
- * @since 1.5
- */
-if( !defined('COOKIEHASH') )
- define('COOKIEHASH', md5(get_option('siteurl')));
</del><span class="cx">
</span><del>-/**
- * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php
- * @since 2.5.0
- */
-$wp_default_secret_key = 'put your unique phrase here';
</del><ins>+wp_default_constants('ms_loaded');
</ins><span class="cx">
</span><del>-/**
- * It is possible to define this in wp-config.php
- * @since 2.0.0
- */
-if ( !defined('USER_COOKIE') )
- define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH);
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.0.0
- */
-if ( !defined('PASS_COOKIE') )
- define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH);
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.5.0
- */
-if ( !defined('AUTH_COOKIE') )
- define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.6.0
- */
-if ( !defined('SECURE_AUTH_COOKIE') )
- define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.6.0
- */
-if ( !defined('LOGGED_IN_COOKIE') )
- define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.3.0
- */
-if ( !defined('TEST_COOKIE') )
- define('TEST_COOKIE', 'wordpress_test_cookie');
-
-/**
- * It is possible to define this in wp-config.php
- * @since 1.2.0
- */
-if ( !defined('COOKIEPATH') )
- define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
-
-/**
- * It is possible to define this in wp-config.php
- * @since 1.5.0
- */
-if ( !defined('SITECOOKIEPATH') )
- define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.6.0
- */
-if ( !defined('ADMIN_COOKIE_PATH') )
- define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.6.0
- */
-if ( !defined('PLUGINS_COOKIE_PATH') )
- define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL) );
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.0.0
- */
-if ( !defined('COOKIE_DOMAIN') )
- define('COOKIE_DOMAIN', false);
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.6.0
- */
-if ( !defined('FORCE_SSL_ADMIN') )
- define('FORCE_SSL_ADMIN', false);
-force_ssl_admin(FORCE_SSL_ADMIN);
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.6.0
- */
-if ( !defined('FORCE_SSL_LOGIN') )
- define('FORCE_SSL_LOGIN', false);
-force_ssl_login(FORCE_SSL_LOGIN);
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.5.0
- */
-if ( !defined( 'AUTOSAVE_INTERVAL' ) )
- define( 'AUTOSAVE_INTERVAL', 60 );
-
-/**
- * It is possible to define this in wp-config.php
- * @since 2.9.0
- */
-if ( !defined( 'EMPTY_TRASH_DAYS' ) )
- define( 'EMPTY_TRASH_DAYS', 30 );
-
</del><span class="cx"> require (ABSPATH . WPINC . '/vars.php');
</span><span class="cx">
</span><span class="cx"> // make taxonomies available to plugins and themes
</span><span class="cx"> // @plugin authors: warning: this gets registered again on the init hook
</span><span class="cx"> create_initial_taxonomies();
</span><span class="cx">
</span><del>-// Check for hacks file if the option is enabled
-if ( get_option('hack_file') ) {
- if ( file_exists(ABSPATH . 'my-hacks.php') )
- require(ABSPATH . 'my-hacks.php');
-}
</del><ins>+wp_load_plugins();
</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);
-}
-unset($current_plugins);
-
</del><span class="cx"> require (ABSPATH . WPINC . '/pluggable.php');
</span><span class="cx">
</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>+wp_set_internal_encoding();
</ins><span class="cx">
</span><del>-
-if ( defined('WP_CACHE') && function_exists('wp_cache_postload') )
</del><ins>+if ( WP_CACHE && function_exists('wp_cache_postload') )
</ins><span class="cx"> wp_cache_postload();
</span><span class="cx">
</span><span class="cx"> do_action('plugins_loaded');
</span><span class="cx">
</span><del>-$default_constants = array( 'WP_POST_REVISIONS' => true );
-foreach ( $default_constants as $c => $v )
- @define( $c, $v ); // will fail if the constant is already defined
-unset($default_constants, $c, $v);
</del><ins>+wp_default_constants('plugins_loaded');
</ins><span class="cx">
</span><del>-// If already slashed, strip.
-if ( get_magic_quotes_gpc() ) {
- $_GET = stripslashes_deep($_GET );
- $_POST = stripslashes_deep($_POST );
- $_COOKIE = stripslashes_deep($_COOKIE);
-}
</del><ins>+wp_magic_quotes();
</ins><span class="cx">
</span><del>-// Escape with wpdb.
-$_GET = add_magic_quotes($_GET );
-$_POST = add_magic_quotes($_POST );
-$_COOKIE = add_magic_quotes($_COOKIE);
-$_SERVER = add_magic_quotes($_SERVER);
-
-// Force REQUEST to be GET + POST. If SERVER, COOKIE, or ENV are needed, use those superglobals directly.
-$_REQUEST = array_merge($_GET, $_POST);
-
</del><span class="cx"> do_action('sanitize_comment_cookies');
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -749,33 +198,13 @@
</span><span class="cx">
</span><span class="cx"> do_action('setup_theme');
</span><span class="cx">
</span><del>-/**
- * Web Path to the current active template directory
- * @since 1.5.0
- */
-define('TEMPLATEPATH', get_template_directory());
</del><ins>+wp_default_constants('setup_theme');
</ins><span class="cx">
</span><del>-/**
- * Web Path to the current active template stylesheet directory
- * @since 2.1.0
- */
-define('STYLESHEETPATH', get_stylesheet_directory());
-
</del><span class="cx"> // Load the default text localization domain.
</span><span class="cx"> load_default_textdomain();
</span><span class="cx">
</span><del>-/**
- * 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);
</del><ins>+wp_find_locale();
</ins><span class="cx">
</span><del>-// Pull in locale data after loading text domain.
-require_once(ABSPATH . WPINC . '/locale.php');
-
</del><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">@@ -783,25 +212,8 @@
</span><span class="cx"> */
</span><span class="cx"> $wp_locale =& new WP_Locale();
</span><span class="cx">
</span><del>-// 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');
</del><ins>+wp_load_theme_functions();
</ins><span class="cx">
</span><del>-// Load in support for template functions which the theme supports
-require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
-
-/**
- * Runs just before PHP shuts down execution.
- *
- * @access private
- * @since 1.2.0
- */
-function shutdown_action_hook() {
- do_action('shutdown');
- wp_cache_close();
-}
</del><span class="cx"> register_shutdown_function('shutdown_action_hook');
</span><span class="cx">
</span><span class="cx"> $wp->init(); // Sets up current user.
</span><span class="lines">@@ -809,4 +221,4 @@
</span><span class="cx"> // Everything is loaded and initialized.
</span><span class="cx"> do_action('init');
</span><span class="cx">
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>