<!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>[47119] trunk/src/wp-admin/includes: Docs: Improve comments in some `wp-admin` files per the documentation standards.</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 { white-space: pre-line; 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/47119">47119</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/47119","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-01-29 00:33:45 +0000 (Wed, 29 Jan 2020)</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'>Docs: Improve comments in some `wp-admin` files per the documentation standards.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/47084">[47084]</a>.
Props passoniate, apedog.
Fixes <a href="https://core.trac.wordpress.org/ticket/49223">#49223</a>, <a href="https://core.trac.wordpress.org/ticket/49227">#49227</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludesmsadminfiltersphp">trunk/src/wp-admin/includes/ms-admin-filters.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.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="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmetaboxesphp"></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/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * WordPress Administration Meta Boxes API.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// -- Post related Meta Boxes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+//
+// Post-related Meta Boxes.
+//
</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"> * Displays post submit form fields.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key. ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div style="display:none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Save' ), '', 'save' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview-<?php echo (int) $post->ID; ?>" id="post-preview"><?php echo $preview_button; ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="wp-preview" id="wp-preview" value="" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; // public post type ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endif; // is_post_type_viewable() ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before the post time/date setting in the Publish meta box.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,18 +210,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $time_format = _x( 'H:i', 'publish box time format' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 != $post->ID ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'future' == $post->post_status ) { // Scheduled for publishing at a future date.
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post is currently scheduled to be published. */
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Scheduled for: %s' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // Already published.
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post was published. */
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Published on: %s' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // Draft, 1 or more saves, no date specified.
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Publish <b>immediately</b>' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // Draft, 1 or more saves, future date specified.
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post is to be published. */
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Schedule for: %s' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else { // draft, 1 or more saves, date specified
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // Draft, 1 or more saves, date specified.
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post is to be published. */
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Publish on: %s' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> date_i18n( $date_format, strtotime( $post->post_date ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> date_i18n( $time_format, strtotime( $post->post_date ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else { // draft (no saves, and thus no date specified)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // Draft (no saves, and thus no date specified).
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Publish <b>immediately</b>' );
</span><span class="cx" style="display: block; padding: 0 10px"> $date = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> $date_string,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +251,7 @@
</span><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $can_publish ) : // Contributors don't get to choose the date of publish
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $can_publish ) : // Contributors don't get to choose the date of publish.
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section curtime misc-pub-curtime">
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="timestamp">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key. ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div style="display:none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Save' ), '', 'save' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,7 +470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post_format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_format = '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">- // Add in the current one if it isn't there yet, in case the current theme doesn't support it
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add in the current one if it isn't there yet, in case the current theme doesn't support it.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_formats[0][] = $post_format;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,7 +599,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allows for an empty term set to be sent. 0 is an invalid term ID and will be ignored by empty() checks.
+ echo "<input type='hidden' name='{$name}[]' value='0' />";
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -792,7 +801,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post WP_Post object of the current post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'post_comment_status_meta_box-options', $post ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'post_comment_status_meta_box-options', $post ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,7 +912,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_list_post_revisions( $post );
</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">-// -- Page related Meta Boxes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+//
+// Page-related Meta Boxes.
+//
</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"> * Display page attributes form fields.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -941,8 +952,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="parent_id"><?php _e( 'Parent' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $pages; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif; // end empty pages check
- endif; // end hierarchical check.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif; // End empty pages check.
+ endif; // End hierarchical check.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( get_page_templates( $post ) ) > 0 && get_option( 'page_for_posts' ) != $post->ID ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $template = ! empty( $post->page_template ) ? $post->page_template : false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,7 +1009,9 @@
</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">-// -- Link related Meta Boxes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+//
+// Link-related Meta Boxes.
+//
</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"> * Display link create form fields.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,7 +1026,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key. ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div style="display:none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Save' ), '', 'save', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1163,7 +1176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $link;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $deprecated ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '2.5.0' ); // Never implemented
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument( __FUNCTION__, '2.5.0' ); // Never implemented.
</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"> $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1413,7 +1426,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We should aim to show the revisions meta box only when there are revisions.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $revisions ) > 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- reset( $revisions ); // Reset pointer for key()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ reset( $revisions ); // Reset pointer for key().
</ins><span class="cx" style="display: block; padding: 0 10px"> $publish_callback_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'revisions_count' => count( $revisions ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'revision_id' => key( $revisions ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1440,7 +1453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core', array( '__back_compat_meta_box' => 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">- // all taxonomies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // All taxonomies.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_object_taxonomies( $post ) as $tax_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = get_taxonomy( $tax_name );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,8 +1536,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $stati[] = 'private';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( get_post_status( $post ), $stati ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the post type support comments, or the post has comments, allow the
- // Comments meta box.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the post type support comments, or the post has comments,
+ // allow the Comments meta box.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/misc.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +178,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $lines[] = rtrim( fgets( $fp ), "\r\n" );
</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">- // Split out the existing file into the preceding lines, and those that appear after the marker
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split out the existing file into the preceding lines, and those that appear after the marker.
</ins><span class="cx" style="display: block; padding: 0 10px"> $pre_lines = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_lines = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_lines = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,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">- // Check to see if there was a change
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check to see if there was a change.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $existing_lines === $insertion ) {
</span><span class="cx" style="display: block; padding: 0 10px"> flock( $fp, LOCK_UN );
</span><span class="cx" style="display: block; padding: 0 10px"> fclose( $fp );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Generate the new file data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Generate the new file data.
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_file_data = implode(
</span><span class="cx" style="display: block; padding: 0 10px"> "\n",
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,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">- // Write to the start of the file, and truncate it to that length
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Write to the start of the file, and truncate it to that length.
</ins><span class="cx" style="display: block; padding: 0 10px"> fseek( $fp, 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $bytes = fwrite( $fp, $new_file_data );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $bytes ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $home_path = get_home_path();
</span><span class="cx" style="display: block; padding: 0 10px"> $web_config_file = $home_path . 'web.config';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( iis7_supports_permalinks() && ( ( ! file_exists( $web_config_file ) && win_is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable( $web_config_file ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $rule = $wp_rewrite->iis7_url_rewrite_rules( false );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $rule ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,11 +598,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"> if ( T_STRING == $tokens[ $t ][0] && ( '(' == $tokens[ $t + 1 ] || '(' == $tokens[ $t + 2 ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If it's a function or class defined locally, there's not going to be any docs available
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If it's a function or class defined locally, there's not going to be any docs available.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ) ) ) || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ignore_functions[] = $tokens[ $t ][1];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add this to our stack of unique references
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add this to our stack of unique references.
</ins><span class="cx" style="display: block; padding: 0 10px"> $functions[] = $tokens[ $t ][1];
</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">@@ -673,7 +673,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'plugins_per_page':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'export_personal_data_requests_per_page':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'remove_personal_data_requests_per_page':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Network admin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Network admin.
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'sites_network_per_page':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'users_network_per_page':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'site_users_network_per_page':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -702,7 +702,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option The option name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $value The number of rows to use.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = apply_filters( 'set-screen-option', false, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = apply_filters( 'set-screen-option', false, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,7 +760,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function iis7_delete_rewrite_rule( $filename ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If configuration file does not exist then rules also do not exist so there is nothing to delete
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If configuration file does not exist then rules also do not exist, so there is nothing to delete.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $filename ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -817,13 +817,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $xpath = new DOMXPath( $doc );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // First check if the rule already exists as in that case there is no need to re-add it
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // First check if the rule already exists as in that case there is no need to re-add it.
</ins><span class="cx" style="display: block; padding: 0 10px"> $wordpress_rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wordpress_rules->length > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check the XPath to the rewrite rule and create XML nodes if they do not exist
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check the XPath to the rewrite rule and create XML nodes if they do not exist.
</ins><span class="cx" style="display: block; padding: 0 10px"> $xmlnodes = $xpath->query( '/configuration/system.webServer/rewrite/rules' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $xmlnodes->length > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $rules_node = $xmlnodes->item( 0 );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsadminfiltersphp"></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-admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms-admin-filters.php 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/ms-admin-filters.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,38 +7,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.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">-// Media Hooks.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Media hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// User Hooks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// User hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'user_admin_notices', 'new_user_email_admin_notice' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_admin_notices', 'new_user_email_admin_notice' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Site Hooks.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Site hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wpmueditblogaction', 'upload_space_setting' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Network hooks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Network hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_site_option_admin_email', 'wp_network_admin_email_change_notification', 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Taxonomy Hooks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Taxonomy hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Post Hooks.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Post hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Tools Hooks.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Tools hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'import_allow_create_users', 'check_import_new_users' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Notices Hooks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Notices hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_notices', 'site_admin_notice' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_admin_notices', 'site_admin_notice' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Update Hooks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Update hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_admin_notices', 'update_nag', 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_admin_notices', 'maintenance_nag', 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Network Admin Hooks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Network Admin hooks.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'add_site_option_new_admin_email', 'update_network_option_new_admin_email', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_site_option_new_admin_email', 'update_network_option_new_admin_email', 10, 2 );
</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 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/ms.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $file;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $file['error'] != '0' ) { // there's already an error
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $file['error'] != '0' ) { // There's already an error.
</ins><span class="cx" style="display: block; padding: 0 10px"> return $file;
</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">@@ -129,7 +129,7 @@
</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 class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @todo Merge with wp_delete_user() ?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Merge with wp_delete_user()?
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( $post_id );
</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">- // Clean links
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clean links.
</ins><span class="cx" style="display: block; padding: 0 10px"> $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $link_ids ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $space_allowed = get_space_allowed();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_numeric( $space_allowed ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $space_allowed = 10; // Default space allowed is 10 MB
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $space_allowed = 10; // Default space allowed is 10 MB.
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $space_used = get_space_used();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -644,11 +644,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $lang_files as $val ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $code_lang = basename( $val, '.mo' );
</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 ( $code_lang == 'en_US' ) { // American English
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $code_lang == 'en_US' ) { // American English.
</ins><span class="cx" style="display: block; padding: 0 10px"> $flag = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $ae = __( 'American English' );
</span><span class="cx" style="display: block; padding: 0 10px"> $output[ $ae ] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $ae . '</option>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $code_lang == 'en_GB' ) { // British English
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $code_lang == 'en_GB' ) { // British English.
</ins><span class="cx" style="display: block; padding: 0 10px"> $flag = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $be = __( 'British English' );
</span><span class="cx" style="display: block; padding: 0 10px"> $output[ $be ] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,11 +658,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">- if ( $flag === false ) { // WordPress english
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $flag === false ) { // WordPress English.
</ins><span class="cx" style="display: block; padding: 0 10px"> $output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . '</option>';
</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">- // Order by name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Order by name.
</ins><span class="cx" style="display: block; padding: 0 10px"> uksort( $output, 'strnatcasecmp' );
</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">@@ -1067,7 +1067,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">- // Parse arguments
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Parse arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_args = wp_parse_args(
</span><span class="cx" style="display: block; padding: 0 10px"> $args,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1077,36 +1077,36 @@
</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">- // Setup the links array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Setup the links array.
</ins><span class="cx" style="display: block; padding: 0 10px"> $screen_links = array();
</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 through tabs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Loop through tabs.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $parsed_args['links'] as $link_id => $link ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Skip link if user can't access
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Skip link if user can't access.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $link['cap'], $parsed_args['blog_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- // Link classes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Link classes.
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes = array( 'nav-tab' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Aria-current attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_current = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Selected is set by the parent OR assumed by the $pagenow global
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Selected is set by the parent OR assumed by the $pagenow global.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['selected'] === $link_id || $link['url'] === $GLOBALS['pagenow'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'nav-tab-active';
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_current = ' aria-current="page"';
</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">- // Escape each class
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Escape each class.
</ins><span class="cx" style="display: block; padding: 0 10px"> $esc_classes = implode( ' ', $classes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get the URL for this link
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the URL for this link.
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( array( 'id' => $parsed_args['blog_id'] ), network_admin_url( $link['url'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add link to nav links
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add link to nav links.
</ins><span class="cx" style="display: block; padding: 0 10px"> $screen_links[ $link_id ] = '<a href="' . esc_url( $url ) . '" id="' . esc_attr( $link_id ) . '" class="' . $esc_classes . '"' . $aria_current . '>' . esc_html( $link['label'] ) . '</a>';
</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="trunksrcwpadminincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/nav-menu.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,12 +138,12 @@
</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"> function wp_nav_menu_setup() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Register meta boxes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register meta boxes.
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nav_menu_post_type_meta_boxes();
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nav_menu_taxonomy_meta_boxes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Register advanced menu items (columns)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Register advanced menu items (columns).
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If first time editing, disable advanced items by default.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,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">- // @todo transient caching of these results with proper invalidation on updating of a post of this type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo Transient caching of these results with proper invalidation on updating of a post of this type.
</ins><span class="cx" style="display: block; padding: 0 10px"> $get_posts = new WP_Query;
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $get_posts->query( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -921,7 +921,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ! isset( $_item_object_data['menu-item-type'] ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> // Or URL is the default.
</span><span class="cx" style="display: block; padding: 0 10px"> in_array( $_item_object_data['menu-item-url'], array( 'https://', 'http://', '' ) ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Or it's not a custom menu item (but not the custom home page).
+ ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||
</ins><span class="cx" style="display: block; padding: 0 10px"> // Or it *is* a custom menu item that already exists.
</span><span class="cx" style="display: block; padding: 0 10px"> ! empty( $_item_object_data['menu-item-db-id'] )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1142,7 +1143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Index menu items by db ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Index menu items by DB ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $unsorted_menu_items as $_item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items[ $_item->db_id ] = $_item;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1164,11 +1165,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"> wp_defer_term_counting( true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Loop through all the menu items' POST variables
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Loop through all the menu items' POST variables.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['menu-item-db-id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Menu item title can't be blank
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Menu item title can't be blank.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1188,7 +1189,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">- // Remove menu items from the menu that weren't in $_POST
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove menu items from the menu that weren't in $_POST.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $menu_items ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $menu_items ) as $menu_item_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_nav_menu_item( $menu_item_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1213,7 +1214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $nav_menu_option['auto_add'][ $key ] );
</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">- // Remove nonexistent/deleted menus
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove non-existent/deleted menus.
</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'nav_menu_options', $nav_menu_option );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1252,7 +1253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $data ) && $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $data as $post_input_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // derive the array path keys via regex and set the value in $_POST.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // derive the array path keys via regex and set the value in $_POST.
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match( '#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $array_bits = array( $matches[1] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1264,7 +1265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_post_data = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Build the new array value from leaf to trunk.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( $i = count( $array_bits ) - 1; $i >= 0; $i -- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ( $i = count( $array_bits ) - 1; $i >= 0; $i-- ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $i == count( $array_bits ) - 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/network.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['subdomain_install'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_install = (bool) $_POST['subdomain_install'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( apache_mod_loaded( 'mod_rewrite' ) ) { // assume nothing
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( apache_mod_loaded( 'mod_rewrite' ) ) { // Assume nothing.
</ins><span class="cx" style="display: block; padding: 0 10px"> $subdomain_install = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! allow_subdirectory_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_install = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_install = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $got_mod_rewrite = got_mod_rewrite();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $got_mod_rewrite ) { // dangerous assumptions
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $got_mod_rewrite ) { // Dangerous assumptions.
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: mod_rewrite */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</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">- if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache).
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <strong><?php _e( 'You cannot change this later.' ); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // @todo: Link to an MS readme? ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // @todo Link to an MS readme? ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table" role="presentation">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( iis7_supports_permalinks() ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // IIS doesn't support RewriteBase, all your RewriteBase are belong to us
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // IIS doesn't support RewriteBase, all your RewriteBase are belong to us.
</ins><span class="cx" style="display: block; padding: 0 10px"> $iis_subdir_match = ltrim( $base, '/' ) . $subdir_match;
</span><span class="cx" style="display: block; padding: 0 10px"> $iis_rewrite_base = ltrim( $base, '/' ) . $rewrite_base;
</span><span class="cx" style="display: block; padding: 0 10px"> $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,7 +616,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else : // end iis7_supports_permalinks(). construct an htaccess file instead:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ else : // End iis7_supports_permalinks(). Construct an .htaccess file instead:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ms_files_rewriting = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,7 +658,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif; // end IIS/Apache code branches.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif; // End IIS/Apache code branches.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/plugin-install.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * for more information on the make-up of possible return values depending on the value of `$action`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function plugins_api( $action, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // include an unmodified $wp_version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Include an unmodified $wp_version.
</ins><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . WPINC . '/version.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $args ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,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 ( ! isset( $args->wp_version ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args->wp_version = substr( $wp_version, 0, 3 ); // X.y
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args->wp_version = substr( $wp_version, 0, 3 ); // x.y
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $api_tags ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $api_tags->get_error_message();
</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">- //Set up the tags in a way which can be interpreted by wp_generate_tag_cloud()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set up the tags in a way which can be interpreted by wp_generate_tag_cloud().
</ins><span class="cx" style="display: block; padding: 0 10px"> $tags = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $api_tags as $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $api = (object) $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">- // Default to a "new" plugin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Default to a "new" plugin.
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 'install';
</span><span class="cx" style="display: block; padding: 0 10px"> $url = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $update_file = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,8 +470,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $api->slug ), 'install-plugin_' . $api->slug );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">- $key = array_keys( $installed_plugin );
- $key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = array_keys( $installed_plugin );
+ // Use the first plugin regardless of the name.
+ // Could have issues for multiple plugins in one directory if they share different version numbers.
+ $key = reset( $key );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $update_file = $api->slug . '/' . $key;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '=' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $status = 'latest_installed';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +482,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $status = 'newer_installed';
</span><span class="cx" style="display: block; padding: 0 10px"> $version = $installed_plugin[ $key ]['Version'];
</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">- //If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the above update check failed, then that probably means that the update checker has out-of-date information, force a refresh.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $loop ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete_site_transient( 'update_plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_plugins();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,7 +491,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"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // "install" & no directory with that slug
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // "install" & no directory with that slug.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'install_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $api->slug ), 'install-plugin_' . $api->slug );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +573,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'other_notes' => _x( 'Other Notes', 'Plugin installer section title' ),
</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">- // Sanitize HTML
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sanitize HTML.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $api->sections as $section_name => $content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $api->sections[ $section_name ] = wp_kses( $content, $plugins_allowedtags );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,7 +586,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_tab = esc_attr( $tab );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; // Default to the Description tab, Do not translate, API returns English.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Default to the Description tab, Do not translate, API returns English.
+ $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $section_titles = array_keys( (array) $api->sections );
</span><span class="cx" style="display: block; padding: 0 10px"> $section = reset( $section_titles );
</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 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/plugin.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- $plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not apply markup/translate as it will be cached.
+ $plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $plugin_data['Name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,13 +358,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array[] Array of arrays of mu-plugin data, keyed by plugin file name. See `get_plugin_data()`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_mu_plugins() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_plugins = array();
- // Files in wp-content/mu-plugins directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_plugins = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_files = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_dir( WPMU_PLUGIN_DIR ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $wp_plugins;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Files in wp-content/mu-plugins directory.
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugins_dir = @opendir( WPMU_PLUGIN_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugins_dir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +388,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- $plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not apply markup/translate as it will be cached.
+ $plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $plugin_data['Name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['Name'] = $plugin_file;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +398,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_plugins[ $plugin_file ] = $plugin_data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php' ) <= 30 ) { // silence is golden
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php' ) <= 30 ) {
+ // Silence is golden.
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $wp_plugins['index.php'] );
</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">@@ -431,7 +435,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_dropins = _get_dropins();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // These exist in the wp-content directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Files in wp-content directory.
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugins_dir = @opendir( WP_CONTENT_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugins_dir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,10 +457,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_readable( WP_CONTENT_DIR . "/$plugin_file" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Do not apply markup/translate as it will be cached.
+ $plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $plugin_data['Name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['Name'] = $plugin_file;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $dropins[ $plugin_file ] = $plugin_data;
</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">@@ -477,21 +485,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _get_dropins() {
</span><span class="cx" style="display: block; padding: 0 10px"> $dropins = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'advanced-cache.php' => array( __( 'Advanced caching plugin.' ), 'WP_CACHE' ), // WP_CACHE
- 'db.php' => array( __( 'Custom database class.' ), true ), // auto on load
- 'db-error.php' => array( __( 'Custom database error message.' ), true ), // auto on error
- 'install.php' => array( __( 'Custom installation script.' ), true ), // auto on installation
- 'maintenance.php' => array( __( 'Custom maintenance message.' ), true ), // auto on maintenance
- 'object-cache.php' => array( __( 'External object cache.' ), true ), // auto on load
- 'php-error.php' => array( __( 'Custom PHP error message.' ), true ), // auto on error
- 'fatal-error-handler.php' => array( __( 'Custom PHP fatal error handler.' ), true ), // auto on error
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'advanced-cache.php' => array( __( 'Advanced caching plugin.' ), 'WP_CACHE' ), // WP_CACHE
+ 'db.php' => array( __( 'Custom database class.' ), true ), // Auto on load.
+ 'db-error.php' => array( __( 'Custom database error message.' ), true ), // Auto on error.
+ 'install.php' => array( __( 'Custom installation script.' ), true ), // Auto on installation.
+ 'maintenance.php' => array( __( 'Custom maintenance message.' ), true ), // Auto on maintenance.
+ 'object-cache.php' => array( __( 'External object cache.' ), true ), // Auto on load.
+ 'php-error.php' => array( __( 'Custom PHP error message.' ), true ), // Auto on error.
+ 'fatal-error-handler.php' => array( __( 'Custom PHP fatal error handler.' ), true ), // Auto on error.
</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"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dropins['sunrise.php'] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dropins['blog-deleted.php'] = array( __( 'Custom site deleted message.' ), true ); // auto on deleted blog
- $dropins['blog-inactive.php'] = array( __( 'Custom site inactive message.' ), true ); // auto on inactive blog
- $dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // auto on archived or spammed blog
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dropins['blog-deleted.php'] = array( __( 'Custom site deleted message.' ), true ); // Auto on deleted blog.
+ $dropins['blog-inactive.php'] = array( __( 'Custom site inactive message.' ), true ); // Auto on inactive blog.
+ $dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // Auto on archived or spammed blog.
</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"> return $dropins;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +646,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $redirect ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( add_query_arg( '_error_nonce', wp_create_nonce( 'plugin-activation-error_' . $plugin ), $redirect ) ); // we'll override this later if the plugin can be included without fatal error
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We'll override this later if the plugin can be included without fatal error.
+ wp_redirect( add_query_arg( '_error_nonce', wp_create_nonce( 'plugin-activation-error_' . $plugin ), $redirect ) );
</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"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -908,7 +917,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! WP_Filesystem( $credentials ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- request_filesystem_credentials( $url, '', true ); // Failed to connect, Error and request again.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Failed to connect. Error and request again.
+ request_filesystem_credentials( $url, '', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $data ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -958,7 +968,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin_file ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If plugin is in its own directory, recursively delete the directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $plugin_file, '/' ) && $this_plugin_dir != $plugins_dir ) { //base check on if plugin includes directory separator AND that it's not the root plugin folder
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Base check on if plugin includes directory separator AND that it's not the root plugin folder.
+ if ( strpos( $plugin_file, '/' ) && $this_plugin_dir != $plugins_dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $deleted = $wp_filesystem->delete( $this_plugin_dir, true );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = $wp_filesystem->delete( $plugins_dir . $plugin_file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1237,7 +1248,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">-// Menu
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Menu.
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1306,7 +1317,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_registered_pages[ $hookname ] = 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">- // No parent as top level
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // No parent as top level.
</ins><span class="cx" style="display: block; padding: 0 10px"> $_parent_pages[ $menu_slug ] = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $hookname;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1412,7 +1423,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">- // Sort the parent array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sort the parent array.
</ins><span class="cx" style="display: block; padding: 0 10px"> ksort( $submenu[ $parent_slug ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hookname = get_plugin_page_hookname( $menu_slug, $parent_slug );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1793,7 +1804,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">-// Pluggable Menu Support -- Private
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Pluggable Menu Support -- Private.
</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"> * Gets the parent file of the current admin page.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1932,7 +1943,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $submenu_array[3];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) { // not the current page
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) { // Not the current page.
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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="trunksrcwpadminincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2020-01-28 00:51:42 UTC (rev 47118)
+++ trunk/src/wp-admin/includes/post.php 2020-01-29 00:33:45 UTC (rev 47119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_data['post_status'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = sanitize_key( $post_data['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // No longer an auto-draft
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // No longer an auto-draft.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'auto-draft' === $post_data['post_status'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'draft';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,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">- // What to do based on which button they pressed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // What to do based on which button they pressed.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['saveasdraft'] ) && '' != $post_data['saveasdraft'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'draft';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $published_statuses = array( 'publish', 'future' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Posts 'submitted for approval' are submitted to $_POST the same as if they were being published.
</ins><span class="cx" style="display: block; padding: 0 10px"> // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['post_status'] ) && ( in_array( $post_data['post_status'], $published_statuses ) && ! current_user_can( $ptype->cap->publish_posts ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $previous_status, $published_statuses ) || ! current_user_can( 'edit_post', $post_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = $_POST;
</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">- // Pass through errors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Pass through errors.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $post_data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $post_data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $revision = current( $revisions );
</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 the revisions have been upgraded
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check if the revisions have been upgraded.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $translated = _wp_get_allowed_postdata( $post_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Post Formats
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Post formats.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['post_format'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_format( $post_ID, $post_data['post_format'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_attachment_metadata( $post_ID, $id3data );
</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">- // Meta Stuff
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Meta stuff.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['meta'] ) && $post_data['meta'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_data['meta'] as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = get_post_meta_by_id( $key );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,13 +372,15 @@
</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">- // Attachment stuff
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Attachment stuff.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' == $post_data['post_type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['_wp_attachment_image_alt'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_alt = wp_strip_all_tags( $image_alt, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // update_meta expects slashed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // update_post_meta() expects slashed.
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
</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">@@ -405,7 +407,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $success = wp_update_post( $translated );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the save failed, see if we can sanity check the main fields and try again
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If the save failed, see if we can sanity check the main fields and try again.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post_title', 'post_content', 'post_excerpt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( $translated );
</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">- // Now that we have an ID we can fix any attachment anchor hrefs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Now that we have an ID we can fix any attachment anchor hrefs.
</ins><span class="cx" style="display: block; padding: 0 10px"> _fix_attachment_links( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_lock( $post_ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +679,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> set_post_format( $post, get_option( 'default_post_format' ) );
</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">- // Schedule auto-draft cleanup
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Schedule auto-draft cleanup.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,7 +819,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear out any data in internal vars.
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_POST['filter'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Edit don't write if we have a post id.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Edit, don't write, if we have a post ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['post_ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return edit_post();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -857,7 +860,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Now that we have an ID we can fix any attachment anchor hrefs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Now that we have an ID we can fix any attachment anchor hrefs.
</ins><span class="cx" style="display: block; padding: 0 10px"> _fix_attachment_links( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_lock( $post_ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -882,7 +885,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">-// Post Meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Post Meta.
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -913,7 +916,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 ( $metakeyinput ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $metakey = $metakeyinput; // default
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $metakey = $metakeyinput; // Default.
</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"> if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -926,7 +929,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"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // add_meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</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"> * Delete post meta data by meta ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,7 +1020,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">-// Private
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Private.
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1038,13 +1041,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero).
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! strpos( $content, '?attachment_id=' ) || ! preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_url = get_bloginfo( 'url' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_url = substr( $site_url, (int) strpos( $site_url, '://' ) ); // remove the http(s)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_url = substr( $site_url, (int) strpos( $site_url, '://' ) ); // Remove the http(s).
</ins><span class="cx" style="display: block; padding: 0 10px"> $replace = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $link_matches[1] as $key => $value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,7 +1057,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- $quote = $url_match[1]; // the quote (single or double)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $quote = $url_match[1]; // The quote (single or double).
</ins><span class="cx" style="display: block; padding: 0 10px"> $url_id = (int) $url_match[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $rel_id = (int) $rel_match[1];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1344,8 +1347,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post->post_name = sanitize_title( $post->post_name ? $post->post_name : $post->post_title, $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the user wants to set a new name -- override the current one
- // Note: if empty name is supplied -- use the title instead, see #6072
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the user wants to set a new name -- override the current one.
+ // Note: if empty name is supplied -- use the title instead, see #6072.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $name ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post->post_name = sanitize_title( $name ? $name : $title, $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1356,10 +1359,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = get_permalink( $post, 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">- // Replace custom post_type Token with generic pagename token for ease of use.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Replace custom post_type token with generic pagename token for ease of use.
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink = str_replace( "%$post->post_type%", '%pagename%', $permalink );
</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 page hierarchy
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle page hierarchy.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $ptype->hierarchical ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $uri = get_page_uri( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $uri ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1431,13 +1434,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $view_link = get_permalink( $post );
</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">- // Allow non-published (private, future) to be viewed at a pretty permalink, in case $post->post_name is set
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow non-published (private, future) to be viewed at a pretty permalink, in case $post->post_name is set.
</ins><span class="cx" style="display: block; padding: 0 10px"> $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Permalinks without a post/page name placeholder don't have anything to edit
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Permalinks without a post/page name placeholder don't have anything to edit.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1448,7 +1451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
</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">- // Encourage a pretty permalink setting
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Encourage a pretty permalink setting.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && ! ( 'page' == get_option( 'show_on_front' ) && $id == get_option( 'page_on_front' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __( 'Change Permalinks' ) . "</a></span>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1692,7 +1695,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_type_object( $post->post_type )->public ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Latest content is in autosave
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Latest content is in autosave.
</ins><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( 'post_preview_' . $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args['preview_id'] = $post->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args['preview_nonce'] = $nonce;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1747,7 +1750,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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 plugins to prevent some users overriding the post lock
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow plugins to prevent some users overriding the post lock.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $override ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e( 'Take over' ); ?></a>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1819,8 +1822,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_autosave['ID'] = $old_autosave->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_autosave['post_author'] = $post_author;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the new autosave has the same content as the post, delete the autosave.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = get_post( $post_id );
</del><span class="cx" style="display: block; padding: 0 10px"> $autosave_is_different = false;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1849,7 +1853,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // _wp_put_post_revision() expects unescaped.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = wp_unslash( $post_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Otherwise create the new autosave as a special post revision
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Otherwise create the new autosave as a special post revision.
</ins><span class="cx" style="display: block; padding: 0 10px"> return _wp_put_post_revision( $post_data, true );
</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">@@ -1922,7 +1926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The ID can be the draft post_id or the autosave revision post_id.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_autosave( $post_data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Back-compat
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back-compat.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'DOING_AUTOSAVE' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'DOING_AUTOSAVE', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1950,10 +1954,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"> if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked.
</ins><span class="cx" style="display: block; padding: 0 10px"> return edit_post( wp_slash( $post_data ) );
</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">- // Non drafts or other users drafts are not overwritten. The autosave is stored in a special post revision for each user.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Non-drafts or other users' drafts are not overwritten.
+ // The autosave is stored in a special post revision for each user.
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_create_post_autosave( wp_slash( $post_data ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>