<!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" />
<title>[34828] trunk: Use `wp_installing()` instead of `WP_INSTALLING` constant.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34828">34828</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34828","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-05 15:05:26 +0000 (Mon, 05 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Use `wp_installing()` instead of `WP_INSTALLING` constant.
The `WP_INSTALLING` constant is a flag that WordPress sets in a number of
places, telling the system that options should be fetched directly from the
database instead of from the cache, that WP should not ping wordpress.org for
updates, that the normal "not installed" checks should be bypassed, and so on.
A constant is generally necessary for this purpose, because the flag is
typically set before the WP bootstrap, meaning that WP functions are not yet
available. However, it is possible - notably, during `wpmu_create_blog()` -
for the "installing" flag to be set after WP has already loaded. In these
cases, `WP_INSTALLING` would be set for the remainder of the process, since
there's no way to change a constant once it's defined. This, in turn, polluted
later function calls that ought to have been outside the scope of site
creation, particularly the non-caching of option data. The problem was
particularly evident in the case of the automated tests, where `WP_INSTALLING`
was set the first time a site was created, and remained set for the rest of the
suite.
The new `wp_installing()` function allows developers to fetch the current
installation status (when called without any arguments) or to set the
installation status (when called with a boolean `true` or `false`). Use of
the `WP_INSTALLING` constant is still supported; `wp_installing()` will default
to `true` if the constant is defined during the bootstrap.
Props boonebgorges, jeremyfelt.
See <a href="https://core.trac.wordpress.org/ticket/31130">#31130</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludestranslationinstallphp">trunk/src/wp-admin/includes/translation-install.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesmssettingsphp">trunk/src/wp-includes/ms-settings.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryphp">trunk/tests/phpunit/includes/factory.php</a></li>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetPageOfCommentphp">trunk/tests/phpunit/tests/comment/getPageOfComment.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralarchivesphp">trunk/tests/phpunit/tests/general/archives.php</a></li>
<li><a href="#trunktestsphpunittestsoptiontransientphp">trunk/tests/phpunit/tests/option/transient.php</a></li>
<li><a href="#trunktestsphpunittestsoptionupdateOptionphp">trunk/tests/phpunit/tests/option/updateOption.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPostClassphp">trunk/tests/phpunit/tests/post/getPostClass.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermsphp">trunk/tests/phpunit/tests/term/getTerms.php</a></li>
<li><a href="#trunktestsphpunitteststermwpInsertTermphp">trunk/tests/phpunit/tests/term/wpInsertTerm.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-admin/admin.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> auth_redirect();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Schedule trash collection
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_screen_options();
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2604,7 +2604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WP_INSTALLING' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-admin/includes/file.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1081,7 +1081,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'ftp_credentials', $stored_credentials );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $credentials;
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-admin/includes/misc.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function update_home_siteurl( $old_value, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( "WP_INSTALLING" ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ms_is_switched() ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludestranslationinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/translation-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/translation-install.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-admin/includes/translation-install.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * in an error, an empty array will be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_available_translations() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_INSTALLING' ) && false !== ( $translations = get_site_transient( 'available_translations' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() && false !== ( $translations = get_site_transient( 'available_translations' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $translations;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/functions.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1260,6 +1260,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Check or set whether WordPress is in "installation" mode.
+ *
+ * If the `WP_INSTALLING` constant is defined during the bootstrap, `wp_installing()` will default to `true`.
+ *
+ * @since 4.4.0
+ *
+ * @staticvar bool $installing
+ *
+ * @param bool $is_installing Optional. True to set WP into Installing mode, false to turn Installing mode off.
+ * Omit this parameter if you only want to fetch the current status.
+ * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will
+ * report whether WP was in installing mode prior to the change to `$is_installing`.
+ */
+function wp_installing( $is_installing = null ) {
+ static $installing = null;
+
+ // Support for the `WP_INSTALLING` constant, defined before WP is loaded.
+ if ( is_null( $installing ) ) {
+ $installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING;
+ }
+
+ if ( ! is_null( $is_installing ) ) {
+ $old_installing = $installing;
+ $installing = $is_installing;
+ return (bool) $old_installing;
+ }
+
+ return (bool) $installing;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test whether blog is already installed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The cache will be checked first. If you have a cache plugin, which saves
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1285,7 +1316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $suppress = $wpdb->suppress_errors();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // If siteurl is not set to autoload, check it specifically
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3337,7 +3368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If installing or in the admin, provide the verbose message.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined('WP_INSTALLING') || defined('WP_ADMIN') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() || defined( 'WP_ADMIN' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die($wpdb->error);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Otherwise, be terse.
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/l10n.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If multisite, check options.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't check blog option when installing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ms_locale = get_network_option( 'WPLANG' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,7 +635,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_admin() || defined( 'WP_INSTALLING' ) || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_admin() || wp_installing() || ( defined( 'WP_REPAIRING' ) && WP_REPAIRING ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/load.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_maintenance() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $upgrading;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,12 +475,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_not_installed() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_blog_installed() && ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> nocache_headers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! is_blog_installed() && ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> nocache_headers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require( ABSPATH . WPINC . '/kses.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,7 +539,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_active_and_valid_plugins() {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $active_plugins = (array) get_option( 'active_plugins', array() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $active_plugins ) || wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $plugins;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/ms-functions.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1116,8 +1116,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( domain_exists($domain, $path, $site_id) )
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !defined('WP_INSTALLING') )
- define( 'WP_INSTALLING', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
+ wp_installing( true );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error('insert_blog', __('Could not create site.'));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2172,7 +2173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_main_site() )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !wp_next_scheduled('update_network_counts') && !defined('WP_INSTALLING') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmssettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-settings.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/ms-settings.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // @todo Investigate when exactly this can occur.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $current_blog ) && defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $current_blog ) && wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_blog = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $current_blog->blog_id = $blog_id = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/option.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WP_SETUP_CONFIG' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // prevent non-existent options from triggering multiple queries
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = wp_cache_get( 'notoptions', 'options' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $notoptions[ $option ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_load_alloptions() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() || ! is_multisite() )
</ins><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_cache_get( 'alloptions', 'options' );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $alloptions_db as $o ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions[$o->option_name] = $o->option_value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() || ! is_multisite() )
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( 'alloptions', $alloptions, 'options' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_load_core_site_options( $site_id = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty($site_id) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $alloptions[$option] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions[ $option ] = $serialized_value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +433,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $result )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'yes' == $autoload ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions();
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions[ $option ] = $serialized_value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +509,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'delete_option', $option );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'yes' == $row->autoload ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $alloptions ) && isset( $alloptions[$option] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -629,7 +629,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = wp_cache_get( $transient, 'transient' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_option = '_transient_' . $transient;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If option is not in alloptions, it is not autoloaded and thus has a timeout
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $alloptions[$transient_option] ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/script-loader.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -829,7 +829,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_style_loader_src( $src, $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_admin_css_colors;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined('WP_INSTALLING') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> return preg_replace( '#^wp-admin/#', './', $src );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'colors' == $handle ) {
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/theme.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,7 +771,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool true Validation flag to check the current theme.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined('WP_INSTALLING') || ! apply_filters( 'validate_current_theme', true ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-includes/update.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_version_check( $extra_stats = array(), $force_check = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $extra_stats Extra statistics to report to the WordPress.org API.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_plugins( $extra_stats = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $extra_stats Extra statistics to report to the WordPress.org API.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_themes( $extra_stats = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,16 +636,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_schedule_update_checks() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !wp_next_scheduled('wp_version_check') && !defined('WP_INSTALLING') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() )
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! wp_installing() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
</span><span class="cx" style="display: block; padding: 0 10px"> $next = strtotime( 'today 7am' );
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/src/wp-settings.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_locale'] = new WP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load the functions for the active theme, for both parent and child theme if applicable.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> include( STYLESHEETPATH . '/functions.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
</span></span></pre></div>
<a id="trunktestsphpunitincludesfactoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/includes/factory.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,6 +173,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $suppress = $wpdb->suppress_errors();
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Tell WP we're done installing.
+ wp_installing( false );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $blog;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/includes/testcase.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,8 +14,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $hooks_saved = array();
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $ignore_files;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $db_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @var WP_UnitTest_Factory
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,19 +56,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_mail', array( $this, 'set_wp_mail_globals' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /*
- * During multisite tests, WP_INSTALLING forces `get_option()` to miss the cache, which causes problems
- * with our query-counting cache tests. As a workaround in the case of tests that require checking
- * 'db_version' (such as any test that uses the Term Meta API), we filter 'pre_option_db_version' and
- * avoid hitting the database.
- *
- * See #31130.
- */
- $this->db_version = get_option( 'db_version' );
- if ( is_multisite() ) {
- add_filter( 'pre_option_db_version', array( $this, 'db_version' ) );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,19 +620,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Return the current database version without hitting the database.
- *
- * This is used to bypass cache problems with some multisite tests. See #31130.
- *
- * @todo Don't do this anymore once #31130 is fixed.
- *
- * @since 4.4.0
- */
- public function db_version() {
- return $this->db_version;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Utility method that resets permalinks and flushes rewrites.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetPageOfCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/getPageOfComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getPageOfComment.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/tests/comment/getPageOfComment.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,11 +60,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11334
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_subsequent_calls_should_hit_cache() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // `get_page_of_comment()` calls `get_option()`, which is not properly cached when WP_INSTALLING.
- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create();
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralarchivesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/archives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/archives.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/tests/general/archives.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,10 +16,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_archives_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->factory->post->create_many( 15, array( 'post_type' => 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'last_changed', 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,4 +108,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $time1, wp_cache_get( 'last_changed', 'posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $num_queries, $wpdb->num_queries );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsoptiontransientphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/transient.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/transient.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/tests/option/transient.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,10 +46,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22807
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_transient_data_with_timeout() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $key = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,10 +67,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22807
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_transient_add_timeout() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $key = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value = rand_str();
</span><span class="cx" style="display: block; padding: 0 10px"> $value2 = rand_str();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,10 +118,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30380
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_nonexistent_key_old_timeout() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Create a transient
</span><span class="cx" style="display: block; padding: 0 10px"> $key = 'test_transient';
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient( $key, 'test', 60 * 10 );
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionupdateOptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/updateOption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/updateOption.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/tests/option/updateOption.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,10 +20,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26394
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_set_autoload_yes_for_nonexistent_option_when_autoload_param_is_missing() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->flush_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'test_update_option_default', 'value' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,10 +40,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26394
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_set_autoload_yes_for_nonexistent_option_when_autoload_param_is_yes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->flush_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'test_update_option_default', 'value', 'yes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,10 +60,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26394
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_set_autoload_no_for_nonexistent_option_when_autoload_param_is_no() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->flush_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'test_update_option_default', 'value', 'no' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,10 +81,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26394
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_set_autoload_no_for_nonexistent_option_when_autoload_param_is_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->flush_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'test_update_option_default', 'value', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,10 +102,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group 26394
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_autoload_should_be_updated_for_existing_option_when_value_is_changed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> add_option( 'foo', 'bar', '', 'no' );
</span><span class="cx" style="display: block; padding: 0 10px"> $updated = update_option( 'foo', 'bar2', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,10 +123,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group 26394
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_autoload_should_not_be_updated_for_existing_option_when_value_is_unchanged() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> add_option( 'foo', 'bar', '', 'yes' );
</span><span class="cx" style="display: block; padding: 0 10px"> $updated = update_option( 'foo', 'bar', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,10 +145,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group 26394
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_autoload_should_not_be_updated_for_existing_option_when_value_is_changed_but_no_value_of_autoload_is_provided() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> add_option( 'foo', 'bar', '', 'yes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPostClassphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/getPostClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostClass.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/tests/post/getPostClass.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,10 +108,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_taxonomy_classes_hit_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, array( 'foo', 'bar' ), 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( $this->post_id, array( 'footag', 'bartag' ), 'post_tag' );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerms.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/tests/term/getTerms.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,10 +382,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_child_of_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true, ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1327,10 +1323,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_parent_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Not testable in MS: wpmu_create_blog() defines WP_INSTALLING, which causes cache misses.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true, ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $this->factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpInsertTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpInsertTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpInsertTerm.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/tests/term/wpInsertTerm.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,15 +468,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5809
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_term_duplicate_slug_different_taxonomy_before_410_schema_change() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // See #31130.
</del><span class="cx" style="display: block; padding: 0 10px"> $old_db_version = 30055;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $_db_version = $this->db_version;
- $this->db_version = $old_db_version;
- } else {
- update_option( 'db_version', $old_db_version );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'db_version', $old_db_version );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax_2', 'post' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,10 +496,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo-2', $new_term->slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $new_term->term_id, $term->term_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->db_version = $_db_version;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'wptests_tax', 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2015-10-05 03:05:53 UTC (rev 34827)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2015-10-05 15:05:26 UTC (rev 34828)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,6 +873,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_current_user_can_for_blog() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $old_uid = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -884,7 +886,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suppress = $wpdb->suppress_errors();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can_for_blog( 12345, 'edit_posts' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->suppress_errors( $suppress );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create( array( 'user_id' => $user->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( current_user_can_for_blog( $blog_id, 'edit_posts' ) );
</span></span></pre>
</div>
</div>
</body>
</html>