<!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>[41289] trunk: General: Improve terminology used when referring to installations of WordPress and its extensions.</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/41289">41289</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/41289","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-08-22 11:51:11 +0000 (Tue, 22 Aug 2017)</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'>General: Improve terminology used when referring to installations of WordPress and its extensions.
"Install" is not a noun, and while it might be acceptable to use the verb as a noun, it is not correct. Using the correct
noun, "installation", increases clarity, especially for non-native English speakers.
This change fixes the usage in user-facing text and in developer documentation.
Fixes <a href="https://core.trac.wordpress.org/ticket/41620">#41620</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscoreupgraderphp">trunk/src/wp-admin/includes/class-core-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclassfileuploadupgraderphp">trunk/src/wp-admin/includes/class-file-upload-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasslanguagepackupgraderphp">trunk/src/wp-admin/includes/class-language-pack-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasspluginupgraderphp">trunk/src/wp-admin/includes/class-plugin-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderphp">trunk/src/wp-admin/includes/class-theme-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesthemeinstallphp">trunk/src/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunksrcwpadminincludestranslationinstallphp">trunk/src/wp-admin/includes/translation-install.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworkphp">trunk/src/wp-admin/network.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionswritingphp">trunk/src/wp-admin/options-writing.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
<li><a href="#trunksrcwpadminupdatephp">trunk/src/wp-admin/update.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswplocaleswitcherphp">trunk/src/wp-includes/class-wp-locale-switcher.php</a></li>
<li><a href="#trunksrcwpincludesclasswpnetworkphp">trunk/src/wp-includes/class-wp-network.php</a></li>
<li><a href="#trunksrcwpincludesdefaultconstantsphp">trunk/src/wp-includes/default-constants.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.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="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunksrcwpincludespluginphp">trunk/src/wp-includes/plugin.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwploadphp">trunk/src/wp-load.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunktestsphpunitincludesmockfsphp">trunk/tests/phpunit/includes/mock-fs.php</a></li>
<li><a href="#trunktestsphpunitincludesobjectcachephp">trunk/tests/phpunit/includes/object-cache.php</a></li>
<li><a href="#trunktestsphpunitincludestracphp">trunk/tests/phpunit/includes/trac.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
<li><a href="#trunktestsphpunittestsfilesystemfindFolderphp">trunk/tests/phpunit/tests/filesystem/findFolder.php</a></li>
<li><a href="#trunktestsphpunittestshttpbasephp">trunk/tests/phpunit/tests/http/base.php</a></li>
<li><a href="#trunkwptestsconfigsamplephp">trunk/wp-tests-config-sample.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3456,7 +3456,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"> * See WP_Theme_Install_List_Table::_get_theme_status() if we wanted to check
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * on post-install status.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * on post-installation status.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success( $status );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3701,7 +3701,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $install_status = install_plugin_install_status( $api );
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
</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 install request is coming from import page, do not return network activation link.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If installation request is coming from import page, do not return network activation link.
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugins_url = ( 'import' === $pagenow ) ? admin_url( 'plugins.php' ) : network_admin_url( 'plugins.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'activate_plugins' ) && is_plugin_inactive( $install_status['file'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscoreupgraderphp"></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-core-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-core-upgrader.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,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 partial update is returned from the API, use that, unless we're doing
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * a reinstall. If we cross the new_bundled version number, then use
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * a reinstallation. If we cross the new_bundled version number, then use
</ins><span class="cx" style="display: block; padding: 0 10px"> * the new_bundled zip. Don't though if the constant is set to skip bundled items.
</span><span class="cx" style="display: block; padding: 0 10px"> * If the API returns a no_content zip, go with it. Finally, default to the full zip.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassfileuploadupgraderphp"></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-file-upload-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-file-upload-upgrader.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-file-upload-upgrader.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Save the data.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->id = wp_insert_attachment( $object, $file['file'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Schedule a cleanup for 2 hours from now in case of failed install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Schedule a cleanup for 2 hours from now in case of failed installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_numeric( $_GET[$urlholder] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasslanguagepackupgraderphp"></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-language-pack-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $result;
</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">- * Whether a bulk upgrade/install is being performed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Whether a bulk upgrade/installation is being performed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var bool $bulk
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,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"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Avoid messing with VCS installs, at least for now.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Avoid messing with VCS installations, at least for now.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Noted: this is not the ideal way to accomplish this.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $check_vcs = new WP_Automatic_Updater;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasspluginupgraderphp"></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-plugin-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-plugin-upgrader.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-plugin-upgrader.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $result;
</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">- * Whether a bulk upgrade/install is being performed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Whether a bulk upgrade/installation is being performed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var bool $bulk
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,17 +56,17 @@
</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">- * Initialize the install strings.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Initialize the installation strings.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function install_strings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->strings['no_package'] = __('Install package not available.');
- $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>…');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->strings['no_package'] = __('Installation package not available.');
+ $this->strings['downloading_package'] = __('Downloading installation package from <span class="code">%s</span>…');
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->strings['unpack_package'] = __('Unpacking the package…');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['installing_package'] = __('Installing the plugin…');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['no_files'] = __('The plugin contains no files.');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->strings['process_failed'] = __('Plugin install failed.');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->strings['process_failed'] = __('Plugin installation failed.');
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->strings['process_success'] = __('Plugin installed successfully.');
</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">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $clear_update_cache Whether to clear the plugin updates cache if successful.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 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">- * @return bool|WP_Error True if the install was successful, false or a WP_Error otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|WP_Error True if the installation was successful, false or a WP_Error otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function install( $package, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderphp"></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-theme-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-upgrader.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-theme-upgrader.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,17 +54,17 @@
</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">- * Initialize the install strings.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Initialize the installation strings.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function install_strings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->strings['no_package'] = __('Install package not available.');
- $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>…');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->strings['no_package'] = __('Installation package not available.');
+ $this->strings['downloading_package'] = __('Downloading installation package from <span class="code">%s</span>…');
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->strings['unpack_package'] = __('Unpacking the package…');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['installing_package'] = __('Installing the theme…');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['no_files'] = __('The theme contains no files.');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->strings['process_failed'] = __('Theme install failed.');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->strings['process_failed'] = __('Theme installation failed.');
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->strings['process_success'] = __('Theme installed successfully.');
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: theme name, 2: version */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['process_success_specific'] = __('Successfully installed the theme <strong>%1$s %2$s</strong>.');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $api || is_wp_error($api) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't show activate or preview actions after install
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't show activate or preview actions after installation
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
</span><span class="cx" style="display: block; padding: 0 10px"> return $install_result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default true.
</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 bool|WP_Error True if the install was successful, false or a WP_Error object otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|WP_Error True if the installation was successful, false or a WP_Error object otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function install( $package, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpautomaticupdaterphp"></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-automatic-updater.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,7 +443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_plugins(); // Check for Plugin updates
</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">- // Send debugging email to all development installs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Send debugging email to admin for all development installations.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->update_results ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></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-ms-sites-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,7 +551,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $actions An array of action links to be displayed.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $blog_id The site ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $blogname Site path, formatted depending on whether it is a sub-domain
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * or subdirectory multisite install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * or subdirectory multisite installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->row_actions( $actions );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,13 +559,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="column-downloaded">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin['active_installs'] >= 1000000 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $active_installs_text = _x( '1+ Million', 'Active plugin installs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $active_installs_text = _x( '1+ Million', 'Active plugin installations' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 == $plugin['active_installs'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $active_installs_text = _x( 'Less Than 10', 'Active plugin installs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $active_installs_text = _x( 'Less Than 10', 'Active plugin installations' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '%s Active Installs' ), $active_installs_text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '%s Active Installations' ), $active_installs_text );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="column-compatibility">
</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 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @var WP_Error|array $result {
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $source The full path to the source the files were installed from.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $source_files List of all the files in the source directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $destination The full path to the install destination folder.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $destination The full path to the installation destination folder.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $destination_name The name of the destination folder, or empty if `$destination`
</span><span class="cx" style="display: block; padding: 0 10px"> * and `$local_destination` are the same.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $local_destination The full local path to the destination folder. This is usually
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,11 +570,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->result = compact( 'source', 'source_files', 'destination', 'destination_name', 'local_destination', 'remote_destination', 'clear_destination' );
</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">- * Filters the install response after the installation has finished.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the installation response after the installation has finished.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $response Install response.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $response Installation response.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $hook_extra Extra arguments passed to hooked filters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $result Installation result data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +590,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Run an upgrade/install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Run an upgrade/installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Attempts to download the package (if it is not a local file), unpack it, and
</span><span class="cx" style="display: block; padding: 0 10px"> * install it in the destination folder.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,7 +612,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $abort_if_destination_exists Whether to abort the installation if the destination
</span><span class="cx" style="display: block; padding: 0 10px"> * folder already exists. When true, `$clear_destination`
</span><span class="cx" style="display: block; padding: 0 10px"> * should be false. Default true.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type bool $is_multi Whether this run is one of multiple upgrade/install
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type bool $is_multi Whether this run is one of multiple upgrade/installation
</ins><span class="cx" style="display: block; padding: 0 10px"> * actions being performed in bulk. When true, the skin
</span><span class="cx" style="display: block; padding: 0 10px"> * WP_Upgrader::header() and WP_Upgrader::footer()
</span><span class="cx" style="display: block; padding: 0 10px"> * aren't called. Default false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,7 +735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->error($result);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->feedback('process_failed');
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Install succeeded.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Installation succeeded.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->skin->feedback('process_success');
</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="trunksrcwpadminincludesmsphp"></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/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/ms.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Avoids a collision between a site slug and a permalink slug.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In a subdirectory install this will make sure that a site and a post do not use the
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * In a subdirectory installation this will make sure that a site and a post do not use the
</ins><span class="cx" style="display: block; padding: 0 10px"> * same subdirectory by checking for a site with the same name as a new post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span></span></pre></div>
<a id="trunksrcwpadminincludesnetworkphp"></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/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/network.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/network.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,10 +27,10 @@
</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">- * Allow subdomain install
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allow subdomain installation
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool Whether subdomain install is allowed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool Whether subdomain installation is allowed
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function allow_subdomain_install() {
</span><span class="cx" style="display: block; padding: 0 10px"> $domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,22 +41,22 @@
</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">- * Allow subdirectory install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allow subdirectory installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</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 bool Whether subdirectory install is allowed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool Whether subdirectory installation is allowed
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function allow_subdirectory_install() {
</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">- * Filters whether to enable the subdirectory install feature in Multisite.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters whether to enable the subdirectory installation feature in Multisite.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $allow Whether to enable the subdirectory install feature in Multisite. Default is false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $allow Whether to enable the subdirectory installation feature in Multisite. Default is false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( apply_filters( 'allow_subdirectory_install', false ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'localhost' == $hostname ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: localhost 2: localhost.localdomain */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,24 +267,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> // Uh oh:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !allow_subdirectory_install() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( !allow_subdomain_install() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _e( 'Because your installation is in a directory, the sites in your WordPress network must use sub-directories.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Uh oh:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !allow_subdirectory_install() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( !allow_subdirectory_install() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php esc_html_e( 'Sub-domain Install' ); ?></th>
- <td><?php _e( 'Because your install is not new, the sites in your WordPress network must use sub-domains.' );
- echo ' <strong>' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><?php esc_html_e( 'Sub-domain Installation' ); ?></th>
+ <td><?php _e( 'Because your installation is not new, the sites in your WordPress network must use sub-domains.' );
+ echo ' <strong>' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/plugin-install.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * an object is returned.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The second filter, {@see 'plugins_api'}, allows a plugin to override the WordPress.org
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Plugin Install API entirely. If `$action` is 'query_plugins' or 'plugin_information',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Plugin Installation API entirely. If `$action` is 'query_plugins' or 'plugin_information',
</ins><span class="cx" style="display: block; padding: 0 10px"> * an object MUST be passed. If `$action` is 'hot_tags' or 'hot_categories', an array MUST
</span><span class="cx" style="display: block; padding: 0 10px"> * be passed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $reviews Whether to return the plugin reviews. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $banners Whether to return the banner images links. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $icons Whether to return the icon links. Default false.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type bool $active_installs Whether to return the number of active installs. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type bool $active_installs Whether to return the number of active installations. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type bool $group Whether to return the assigned group. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $contributors Whether to return the list of contributors. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,19 +113,19 @@
</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">- * Filters the WordPress.org Plugin Install API arguments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the WordPress.org Plugin Installation API arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Important: An object MUST be returned to this filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $args Plugin API arguments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $action The type of information being requested from the Plugin Install API.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $action The type of information being requested from the Plugin Installation API.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'plugins_api_args', $args, $action );
</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">- * Filters the response for the current WordPress.org Plugin Install API request.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the response for the current WordPress.org Plugin Installation API request.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Passing a non-false value will effectively short-circuit the WordPress.org API request.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param false|object|array $result The result object or array. Default false.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $action The type of information being requested from the Plugin Install API.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $action The type of information being requested from the Plugin Installation API.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object $args Plugin API arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $res = apply_filters( 'plugins_api', false, $action, $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,12 +193,12 @@
</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">- * Filters the Plugin Install API response results.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the Plugin Installation API response results.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object|WP_Error $res Response object or WP_Error.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $action The type of information being requested from the Plugin Install API.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $action The type of information being requested from the Plugin Installation API.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object $args Plugin API arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'plugins_api_result', $res, $action, $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,7 +515,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section = reset( $section_titles );
</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">- iframe_header( __( 'Plugin Install' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframe_header( __( 'Plugin Installation' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_with_banner = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,11 +587,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } if ( ! empty( $api->tested ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } if ( isset( $api->active_installs ) ) { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><strong><?php _e( 'Active Installs:' ); ?></strong> <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><strong><?php _e( 'Active Installations:' ); ?></strong> <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $api->active_installs >= 1000000 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _ex( '1+ Million', 'Active plugin installs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _ex( '1+ Million', 'Active plugin installations' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 == $api->active_installs ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _ex( 'Less Than 10', 'Active plugin installs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _ex( 'Less Than 10', 'Active plugin installations' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo number_format_i18n( $api->active_installs ) . '+';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/plugin.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +419,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'advanced-cache.php' => array( __( 'Advanced caching plugin.' ), 'WP_CACHE' ), // WP_CACHE
</span><span class="cx" style="display: block; padding: 0 10px"> 'db.php' => array( __( 'Custom database class.' ), true ), // auto on load
</span><span class="cx" style="display: block; padding: 0 10px"> 'db-error.php' => array( __( 'Custom database error message.' ), true ), // auto on error
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'install.php' => array( __( 'Custom install script.' ), true ), // auto on install
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'install.php' => array( __( 'Custom installation script.' ), true ), // auto on installation
</ins><span class="cx" style="display: block; padding: 0 10px"> 'maintenance.php' => array( __( 'Custom maintenance message.' ), true ), // auto on maintenance
</span><span class="cx" style="display: block; padding: 0 10px"> 'object-cache.php' => array( __( 'External object cache.' ), true ), // auto on load
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></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/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/schema.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,9 +890,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $email Email address for the network administrator.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $site_name The name of the network.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path Optional. The path to append to the network's domain name. Default '/'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $subdomain_install Optional. Whether the network is a subdomain install or a subdirectory install.
- * Default false, meaning the network is a subdirectory install.
- * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $subdomain_install Optional. Whether the network is a subdomain installation or a subdirectory installation.
+ * Default false, meaning the network is a subdirectory installation.
+ * @return bool|WP_Error True on success, or WP_Error on warning (with the installation otherwise successful,
</ins><span class="cx" style="display: block; padding: 0 10px"> * so the error code must be checked) or failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemeinstallphp"></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/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme-install.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/theme-install.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * WordPress Theme Install Administration API
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * WordPress Theme Installation Administration API
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Administration
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $theme ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $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">- iframe_header( __('Theme Install') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframe_header( __('Theme Installation') );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $wp_list_table ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/translation-install.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * WordPress Translation Install Administration API
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * WordPress Translation Installation Administration API
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Administration
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Allows a plugin to override the WordPress.org Translation Install API entirely.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allows a plugin to override the WordPress.org Translation Installation API entirely.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the Translation Install API response results.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the Translation Installation API response results.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/update-core.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1197,7 +1197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Redirect to the About WordPress page after a successful upgrade.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This function is only needed when the existing install is older than 3.4.0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This function is only needed when the existing installation is older than 3.4.0.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/update.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Gets the best available (and enabled) Auto-Update for WordPress Core.
</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 there's 1.2.3 and 1.3 on offer, it'll choose 1.3 if the install allows it, else, 1.2.3
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If there's 1.2.3 and 1.3 on offer, it'll choose 1.3 if the installation allows it, else, 1.2.3
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $failed = get_site_option( 'auto_core_update_failed' );
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If an update failed critically, we may have copied over version.php but not other files.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In that case, if the install claims we're running the version we attempted, nag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * In that case, if the installation claims we're running the version we attempted, nag.
</ins><span class="cx" style="display: block; padding: 0 10px"> * This is serious enough to err on the side of nagging.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If we simply failed to update before we tried to copy any files, then assume things are
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/includes/upgrade.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Administration
</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">-/** Include user install customize script. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Include user installation customization script. */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists(WP_CONTENT_DIR . '/install.php') )
</span><span class="cx" style="display: block; padding: 0 10px"> require (WP_CONTENT_DIR . '/install.php');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during installation.') ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_flush();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</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">- * Maybe enable pretty permalinks on install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Maybe enable pretty permalinks on installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If after enabling pretty permalinks don't work, fallback to query-string permalinks.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,7 +452,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</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">- * Functions to be called in install and upgrade scripts.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Functions to be called in installation and upgrade scripts.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Contains conditional checks to determine which upgrade scripts to run,
</span><span class="cx" style="display: block; padding: 0 10px"> * based on database version and WP version being updated-to.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2060,7 +2060,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Utility version of get_option that is private to install/upgrade.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Utility version of get_option that is private to installation/upgrade.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ignore
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.1
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></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/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/install.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
</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">- * Display install header.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Display installation header.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></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/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/network/settings.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Load WordPress Administration Bootstrap */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** WordPress Translation Install API */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** WordPress Translation Installation API */
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network_options' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'first_comment_email',
</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">- // Handle translation install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle translation installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $language = wp_download_language_pack( $_POST['WPLANG'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $language ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></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/network/site-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/network/site-new.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Load WordPress Administration Bootstrap */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** WordPress Translation Install API */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** WordPress Translation Installation API */
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'create_sites' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $domain = strtolower( $blog['domain'] );
</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 not a subdomain install, make sure the domain isn't a reserved word
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If not a subdomain installation, make sure the domain isn't a reserved word
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdirectory_reserved_names = get_subdirectory_reserved_names();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => 1
</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">- // Handle translation install for the new site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle translation installation for the new site.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['WPLANG'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $_POST['WPLANG'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['WPLANG'] = ''; // en_US
</span></span></pre></div>
<a id="trunksrcwpadminnetworkphp"></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/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/network.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,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"> $network_help = '<p>' . __('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your installation. Fill out the network details, and click Install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></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/options-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/options-general.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Administration Bootstrap */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** WordPress Translation Install API */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** WordPress Translation Installation API */
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_options' ) )
</span></span></pre></div>
<a id="trunksrcwpadminoptionswritingphp"></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/options-writing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-writing.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/options-writing.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'options-postemail',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Post Via Email' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress installation an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '</p>',
</ins><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></pre></div>
<a id="trunksrcwpadminoptionsphp"></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/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/options.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['timezone_string'] = '';
</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">- // Handle translation install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle translation installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-install.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/plugin-install.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "install_plugins_pre_{$tab}" );
</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">- * Call the pre upload action on every non-upload plugin install screen
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Call the pre upload action on every non-upload plugin installation screen
</ins><span class="cx" style="display: block; padding: 0 10px"> * because the form is always displayed on these screens.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'upload' !== $tab ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Output the upload plugin form on every non-upload plugin install screen, so it can be
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Output the upload plugin form on every non-upload plugin installation screen, so it can be
</ins><span class="cx" style="display: block; padding: 0 10px"> * displayed via JavaScript rather then opening up the devoted upload plugin page.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'upload' !== $tab ) {
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/setup-config.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Load WordPress Administration Upgrade API */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** Load WordPress Translation Install API */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Load WordPress Translation Installation API */
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> nocache_headers();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>'
</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">-// Check if wp-config.php exists above the root directory but is not part of another install
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check if wp-config.php exists above the root directory but is not part of another installation
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: install.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,8 +368,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo htmlentities($line, ENT_COMPAT, 'UTF-8');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php _e( 'After you’ve done that, click “Run the install.”' ); ?></p>
-<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php _e( 'After you’ve done that, click “Run the installation.”' ); ?></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <script>
</span><span class="cx" style="display: block; padding: 0 10px"> (function(){
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></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/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/theme-install.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before each of the tabs are rendered on the Install Themes page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The dynamic portion of the hook name, `$tab`, refers to the current
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * theme install tab. Possible values are 'dashboard', 'search', 'upload',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * theme installation tab. Possible values are 'dashboard', 'search', 'upload',
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'featured', 'new', or 'updated'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires at the top of each of the tabs on the Install Themes page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The dynamic portion of the hook name, `$tab`, refers to the current
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * theme install tab. Possible values are 'dashboard', 'search', 'upload',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * theme installation tab. Possible values are 'dashboard', 'search', 'upload',
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'featured', 'new', or 'updated'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span></span></pre></div>
<a id="trunksrcwpadminupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-admin/update.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $api );
</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">- $title = __('Plugin Install');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = __('Plugin Installation');
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'plugins.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'plugin-install.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +535,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"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Import theme starter content for fresh installs when landing in the customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Import theme starter content for fresh installations when landing in the customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Import starter content at after_setup_theme:100 so that any
</span><span class="cx" style="display: block; padding: 0 10px"> * add_theme_support( 'starter-content' ) calls will have been made.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1760,7 +1760,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_validities = $this->validate_setting_values( $post_values );
</span><span class="cx" style="display: block; padding: 0 10px"> $exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installations.
</ins><span class="cx" style="display: block; padding: 0 10px"> $self_url = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $state_query_params = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize_theme',
</span></span></pre></div>
<a id="trunksrcwpincludesclasswplocaleswitcherphp"></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/class-wp-locale-switcher.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-locale-switcher.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/class-wp-locale-switcher.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,11 +158,11 @@
</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">- * Filters the WordPress install's locale.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the locale of the WordPress installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $locale The WordPress install's locale.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $locale The locale of the WordPress installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The locale currently being switched to.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_locale( $locale ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpnetworkphp"></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/class-wp-network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-network.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/class-wp-network.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * only domains, thus meaning paths never need to be considered.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This is a very basic optimization; anything further could have
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * drawbacks depending on the setup, so this is best done per-install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * drawbacks depending on the setup, so this is best done per-installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $using_paths = true;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_using_ext_object_cache() ) {
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultconstantsphp"></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/default-constants.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-constants.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/default-constants.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +349,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define('STYLESHEETPATH', get_stylesheet_directory());
</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">- * Slug of the default theme for this install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Slug of the default theme for this installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Used as the default theme when installing new sites.
</span><span class="cx" style="display: block; padding: 0 10px"> * It will be used as the fallback if the current theme doesn't exist.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/deprecated.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3372,7 +3372,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Determine if TinyMCE is available.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks to see if the user has deleted the tinymce files to slim down
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * their WordPress install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * their WordPress installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.9.0
</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 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/functions.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1388,13 +1388,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $suppress = $wpdb->suppress_errors();
</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">- * Loop over the WP tables. If none exist, then scratch install is allowed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Loop over the WP tables. If none exist, then scratch installation is allowed.
</ins><span class="cx" style="display: block; padding: 0 10px"> * If one or more exist, suggest table repair since we got here because the
</span><span class="cx" style="display: block; padding: 0 10px"> * options table could not be accessed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_tables = $wpdb->tables();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_tables as $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The existence of custom user tables shouldn't suggest an insane state or prevent a clean installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4326,7 +4326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Request is hitting a file above ABSPATH
</span><span class="cx" style="display: block; padding: 0 10px"> $subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Strip off any file/query params from the path, appending the sub directory to the install
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip off any file/query params from the path, appending the sub directory to the installation
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = preg_replace( '#/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] ) . $subdirectory;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $path = $_SERVER['REQUEST_URI'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4408,7 +4408,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Determine whether a network is the main network of the Multisite install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determine whether a network is the main network of the Multisite installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/l10n.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $locale ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters WordPress install's locale ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the locale ID of the WordPress installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -979,9 +979,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * are dummy gettext calls to get them into the POT file and this function
</span><span class="cx" style="display: block; padding: 0 10px"> * properly translates them back.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The before_last_bar() call is needed, because older installs keep the roles
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The before_last_bar() call is needed, because older installations keep the roles
</ins><span class="cx" style="display: block; padding: 0 10px"> * using the old context format: 'Role name|User role' and just skipping the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * content after the last bar is easier than fixing them in the DB. New installs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * content after the last bar is easier than fixing them in the DB. New installations
</ins><span class="cx" style="display: block; padding: 0 10px"> * won't suffer from that problem.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></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-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/ms-deprecated.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $limit Number of sites to limit the query to. Default 100.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $offset Exclude the first x sites. Used in combination with the $limit parameter. Default 0.
</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 array An empty array if the install is considered "large" via wp_is_large_network(). Otherwise,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array An empty array if the installation is considered "large" via wp_is_large_network(). Otherwise,
</ins><span class="cx" style="display: block; padding: 0 10px"> * an associative array of site data arrays, each containing the site (network) ID, blog ID,
</span><span class="cx" style="display: block; padding: 0 10px"> * site domain and path, dates registered and modified, and the language ID. Also, boolean
</span><span class="cx" style="display: block; padding: 0 10px"> * values for whether the site is public, archived, mature, spam, and/or deleted.
</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 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/ms-functions.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,7 +586,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"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * On sub dir installs, some names are so illegal, only a filter can
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * On sub dir installations, some names are so illegal, only a filter can
</ins><span class="cx" style="display: block; padding: 0 10px"> * spring them from jail.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -680,7 +680,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Array of domain, path, blog name, blog title, user and error messages.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $domain Domain for the site.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $path Path for the site. Used in subdirectory installs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $path Path for the site. Used in subdirectory installations.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $blogname The unique site name (slug).
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $blog_title Blog title.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string|WP_User $user By default, an empty string. A user object if provided.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1164,9 +1164,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * as when a Super Admin creates a new site. Hook to {@see 'wpmu_new_blog'}
</span><span class="cx" style="display: block; padding: 0 10px"> * for events that should affect all new sites.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * On subdirectory installs, $domain is the same as the main site's
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * On subdirectory installations, $domain is the same as the main site's
</ins><span class="cx" style="display: block; padding: 0 10px"> * domain, and the path is the subdirectory name (eg 'example.com'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * and '/blog1/'). On subdomain installs, $domain is the new subdomain +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * and '/blog1/'). On subdomain installations, $domain is the new subdomain +
</ins><span class="cx" style="display: block; padding: 0 10px"> * root domain (eg 'blog1.example.com'), and $path is '/'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,7 +1180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'spam', 'deleted', or 'lang_id') the given site status(es) will be
</span><span class="cx" style="display: block; padding: 0 10px"> * updated. Otherwise, keys and values will be used to set options for
</span><span class="cx" style="display: block; padding: 0 10px"> * the new site. Default empty array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $network_id Optional. Network ID. Only relevant on multi-network installs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $network_id Optional. Network ID. Only relevant on multi-network installations.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error Returns WP_Error object on failure, the new site ID on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $network_id = 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1240,7 +1240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id User ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Site domain.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path Site path.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $network_id Network ID. Only relevant on multi-network installs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $network_id Network ID. Only relevant on multi-network installations.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $meta Meta data. Used to set initial site options.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $network_id, $meta );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1352,7 +1352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain The domain to be checked.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path The path to be checked.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $network_id Optional. Network ID. Relevant only on multi-network installs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $network_id Optional. Network ID. Relevant only on multi-network installations.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function domain_exists( $domain, $path, $network_id = 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1374,7 +1374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|null $result The blog_id if the blogname exists, null otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Domain to be checked.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path Path to be checked.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $network_id Network ID. Relevant only on multi-network installs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $network_id Network ID. Relevant only on multi-network installations.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'domain_exists', $result, $domain, $path, $network_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,7 +1391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain The domain of the new site.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path The path of the new site.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $network_id Unless you're running a multi-network install, be sure to set this value to 1.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $network_id Unless you're running a multi-network installation, be sure to set this value to 1.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int|false The ID of the new row
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function insert_blog($domain, $path, $network_id) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2570,7 +2570,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieves a list of reserved site on a sub-directory Multisite install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves a list of reserved site on a sub-directory Multisite installation.
</ins><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 class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2583,7 +2583,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters reserved site names on a sub-directory Multisite install.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters reserved site names on a sub-directory Multisite installation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0 'wp-admin', 'wp-content', 'wp-includes', 'wp-json', and 'embed' were added
</span></span></pre></div>
<a id="trunksrcwpincludesmsloadphp"></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-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/ms-load.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,8 +308,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $subdomain ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A "subdomain" install can be re-interpreted to mean "can support any domain".
- * If we're not dealing with one of these installs, then the important part is determining
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A "subdomain" installation can be re-interpreted to mean "can support any domain".
+ * If we're not dealing with one of these installations, then the important part is determining
</ins><span class="cx" style="display: block; padding: 0 10px"> * the network first, because we need the network's path to identify any sites.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,10 +401,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'ms_site_not_found', $current_site, $domain, $path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $subdomain && ! defined( 'NOBLOGREDIRECT' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // For a "subdomain" install, redirect to the signup form specifically.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // For a "subdomain" installation, redirect to the signup form specifically.
</ins><span class="cx" style="display: block; padding: 0 10px"> $destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $subdomain ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // For a "subdomain" install, the NOBLOGREDIRECT constant
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // For a "subdomain" installation, the NOBLOGREDIRECT constant
</ins><span class="cx" style="display: block; padding: 0 10px"> // can be used to avoid a redirect to the signup form.
</span><span class="cx" style="display: block; padding: 0 10px"> // Using the ms_site_not_found action is preferred to the constant.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '%siteurl%' !== NOBLOGREDIRECT ) {
</span></span></pre></div>
<a id="trunksrcwpincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/plugin.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/plugin.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -780,12 +780,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The plugin should not run arbitrary code outside of functions, when
</span><span class="cx" style="display: block; padding: 0 10px"> * registering the uninstall hook. In order to run using the hook, the plugin
</span><span class="cx" style="display: block; padding: 0 10px"> * will have to be included, which means that any code laying outside of a
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * function will be run during the uninstall process. The plugin should not
- * hinder the uninstall process.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * function will be run during the uninstallation process. The plugin should not
+ * hinder the uninstallation process.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If the plugin can not be written without running code within the plugin, then
</span><span class="cx" style="display: block; padding: 0 10px"> * the plugin should create a file named 'uninstall.php' in the base plugin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * folder. This file will be called, if it exists, during the uninstall process
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * folder. This file will be called, if it exists, during the uninstallation process
</ins><span class="cx" style="display: block; padding: 0 10px"> * bypassing the uninstall hook. The plugin, when using the 'uninstall.php'
</span><span class="cx" style="display: block; padding: 0 10px"> * should always check for the 'WP_UNINSTALL_PLUGIN' constant, before
</span><span class="cx" style="display: block; padding: 0 10px"> * executing.
</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 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/script-loader.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,7 +743,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'installing' => __( 'Installing...' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'pluginInstalled' => _x( 'Installed!', 'plugin' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'themeInstalled' => _x( 'Installed!', 'theme' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'installFailedShort' => __( 'Install Failed!' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'installFailedShort' => __( 'Installation Failed!' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Error string for a failed installation */
</span><span class="cx" style="display: block; padding: 0 10px"> 'installFailed' => __( 'Installation failed: %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin name and version */
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-includes/user.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1383,7 +1383,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.6.0 The `aim`, `jabber`, and `yim` fields were removed as default user contact
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * methods for new installs. See wp_get_user_contact_methods().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * methods for new installations. See wp_get_user_contact_methods().
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 The user's locale can be passed to `$userdata`.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span></span></pre></div>
<a id="trunksrcwploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-load.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-load.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( @file_exists( dirname( ABSPATH ) . '/wp-config.php' ) && ! @file_exists( dirname( ABSPATH ) . '/wp-settings.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** The config file resides one level above ABSPATH but is not part of another install */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** The config file resides one level above ABSPATH but is not part of another installation */
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( ABSPATH ) . '/wp-config.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/src/wp-settings.php 2017-08-22 11:51:11 UTC (rev 41289)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * These can't be directly globalized in version.php. When updating,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * we're including version.php from another install and don't want
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * we're including version.php from another installation and don't want
</ins><span class="cx" style="display: block; padding: 0 10px"> * these values to be overridden if already set.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version, $wp_local_package;
</span></span></pre></div>
<a id="trunktestsphpunitincludesmockfsphp"></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/mock-fs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/mock-fs.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/tests/phpunit/includes/mock-fs.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = ABSPATH;
</span><span class="cx" style="display: block; padding: 0 10px"> $folder = $this->find_folder( $path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Perhaps the FTP folder is rooted at the WordPress installation, Check for wp-includes folder in root, Could have some false positives, but rare.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $folder && $this->is_dir('/wp-includes') )
</span><span class="cx" style="display: block; padding: 0 10px"> $folder = '/';
</span><span class="cx" style="display: block; padding: 0 10px"> return $folder;
</span></span></pre></div>
<a id="trunktestsphpunitincludesobjectcachephp"></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/object-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/object-cache.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/tests/phpunit/includes/object-cache.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,7 +835,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"> * This approach is borrowed from Sivel and Boren. Use the salt for easy cache invalidation and for
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * multi single WP installs on the same server.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * multi single WP installations on the same server.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_CACHE_KEY_SALT' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_CACHE_KEY_SALT', '' );
</span></span></pre></div>
<a id="trunktestsphpunitincludestracphp"></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/trac.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/trac.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/tests/phpunit/includes/trac.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class TracTickets {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When open tickets for a Trac install is requested, the results are stored here.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When open tickets for a Trac installation is requested, the results are stored here.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunktestsphpunitincludesutilsphp"></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/utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/utils.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/tests/phpunit/includes/utils.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,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"> // convert valid xml to an array tree structure
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// kinda lame but it works with a default php 4 install
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// kinda lame but it works with a default php 4 installation
</ins><span class="cx" style="display: block; padding: 0 10px"> class testXMLParser {
</span><span class="cx" style="display: block; padding: 0 10px"> var $xml;
</span><span class="cx" style="display: block; padding: 0 10px"> var $data = array();
</span></span></pre></div>
<a id="trunktestsphpunittestsfilesystemfindFolderphp"></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/filesystem/findFolder.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/filesystem/findFolder.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/tests/phpunit/tests/filesystem/findFolder.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Two WordPress installs, with one contained within the other
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Two WordPress installations, with one contained within the other
</ins><span class="cx" style="display: block; padding: 0 10px"> * FTP / = /var/www/example.com/ on Disk
</span><span class="cx" style="display: block; padding: 0 10px"> * example.com at /
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.example.com at /wp.example.com/wordpress/
</span></span></pre></div>
<a id="trunktestsphpunittestshttpbasephp"></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/http/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/base.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/tests/phpunit/tests/http/base.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_ssl() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_http_supports( array( 'ssl' ) ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->fail( 'This install of PHP does not support SSL' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->fail( 'This installation of PHP does not support SSL' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $res = wp_remote_get( 'https://wordpress.org/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $res );
</span></span></pre></div>
<a id="trunkwptestsconfigsamplephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/wp-tests-config-sample.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/wp-tests-config-sample.php 2017-08-22 11:11:23 UTC (rev 41288)
+++ trunk/wp-tests-config-sample.php 2017-08-22 11:51:11 UTC (rev 41289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Path to the theme to test with.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The 'default' theme is symlinked from test/phpunit/data/themedir1/default into
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * the themes directory of the WordPress install defined above.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * the themes directory of the WordPress installation defined above.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_DEFAULT_THEME', 'default' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>