<!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>[47785] trunk/src/wp-admin: Coding Standards: Use strict comparison in some `wp-admin` files.</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/47785">47785</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/47785","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-05-12 18:30:03 +0000 (Tue, 12 May 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'>Coding Standards: Use strict comparison in some `wp-admin` files.
Props pikamander2, mukesh27, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/49239">#49239</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminheaderphp">trunk/src/wp-admin/admin-header.php</a></li>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadmineditformcommentphp">trunk/src/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunksrcwpadmineditlinkformphp">trunk/src/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunksrcwpadminedittagformphp">trunk/src/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadmininstallhelperphp">trunk/src/wp-admin/install-helper.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminlinkmanagerphp">trunk/src/wp-admin/link-manager.php</a></li>
<li><a href="#trunksrcwpadminlinkparseopmlphp">trunk/src/wp-admin/link-parse-opml.php</a></li>
<li><a href="#trunksrcwpadminlinkphp">trunk/src/wp-admin/link.php</a></li>
<li><a href="#trunksrcwpadminloadstylesphp">trunk/src/wp-admin/load-styles.php</a></li>
<li><a href="#trunksrcwpadminmediauploadphp">trunk/src/wp-admin/media-upload.php</a></li>
<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-header.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/admin-header.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_title = get_bloginfo( 'name' );
</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 ( $admin_title == $title ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $admin_title === $title ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Admin screen title. %s: Admin screen name. */
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_title = sprintf( __( '%s — WordPress' ), $title );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_head' );
</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 ( get_user_setting( 'mfold' ) == 'f' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( get_user_setting( 'mfold' ) === 'f' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' folded';
</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="trunksrcwpadminadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/admin.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'after_db_upgrade' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( get_option( 'db_version' ) != $wp_db_version && empty( $_POST ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( get_option( 'db_version' ) !== $wp_db_version && empty( $_POST ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span></span></pre></div>
<a id="trunksrcwpadminasyncuploadphp"></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/async-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/async-upload.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/async-upload.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['attachment_id'] ) && intval( $_REQUEST['attachment_id'] ) && $_REQUEST['fetch'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = intval( $_REQUEST['attachment_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' != $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' !== $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid post type.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $id ) ) {
</span></span></pre></div>
<a id="trunksrcwpadmincommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/comment.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/comment.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,16 +22,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'deletecomment';
</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 ( 'cdc' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'cdc' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'delete';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( 'mac' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'mac' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'approve';
</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( $_GET['dt'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'spam' == $_GET['dt'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'spam' === $_GET['dt'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'spam';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'trash' == $_GET['dt'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'trash' === $_GET['dt'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'trash';
</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">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __( 'Sorry, you are not allowed to edit this comment.' ) );
</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 ( 'trash' == $comment->comment_approved ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $comment->comment_approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
</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">@@ -101,7 +101,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"> // No need to re-approve/re-trash/re-spam a comment.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( str_replace( '1', 'approve', $comment->comment_approved ) == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_replace( '1', 'approve', $comment->comment_approved ) === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-header.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $formaction = $action . 'comment';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nonce_action = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nonce_action = ( 'approve' === $action ) ? 'approve-comment_' : 'delete-comment_';
</ins><span class="cx" style="display: block; padding: 0 10px"> $nonce_action .= $comment_id;
</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">@@ -137,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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 ( '0' != $comment->comment_approved ) { // If not unapproved.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' !== $comment->comment_approved ) { // If not unapproved.
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = '';
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_approved ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case '1':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,9 +271,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this 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">- if ( '' != wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $redir = wp_get_referer();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '' != wp_get_original_referer() && ! $noredir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( wp_get_original_referer() && ! $noredir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $redir = wp_get_original_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redir = admin_url( 'edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,10 +348,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $comment_id The ID of the comment being edited.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $location );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ exit;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- exit();
-
</del><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Unknown action.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmineditcommentsphp"></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/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/edit-comments.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $doaction ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-comments' );
</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 ( 'delete_all' == $doaction && ! empty( $_REQUEST['pagegen_timestamp'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'delete_all' === $doaction && ! empty( $_REQUEST['pagegen_timestamp'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_status = wp_unslash( $_REQUEST['comment_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_time = wp_unslash( $_REQUEST['pagegen_timestamp'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $doaction = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['delete_comments'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = $_REQUEST['delete_comments'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doaction = ( '-1' !== $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['ids'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( wp_get_referer() ) {
</span></span></pre></div>
<a id="trunksrcwpadmineditformadvancedphp"></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/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/edit-form-advanced.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_ID = isset( $user_ID ) ? (int) $user_ID : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $action ) ? $action : '';
</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 ( get_option( 'page_for_posts' ) == $post_ID && empty( $post->post_content ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( (int) get_option( 'page_for_posts' ) === $post_ID && empty( $post->post_content ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'edit_form_after_title', '_wp_posts_page_notice' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_post_type_support( $post_type, 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,8 +228,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notice = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $form_extra = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'auto-draft' == $post->post_status ) {
- if ( 'edit' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'auto-draft' === $post->post_status ) {
+ if ( 'edit' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post->post_title = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $autosave = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +276,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">-if ( 'post' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'post' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $customize_display = '<p>' . __( 'The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +313,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/article/wordpress-editor/">Documentation on Writing and Editing Posts</a>' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( 'page' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'page' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $about_pages = '<p>' . __( 'Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the “Parent” of the other, creating a group of pages.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/article/pages-screen/">Documentation on Editing Pages</a>' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( 'attachment' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'attachment' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +351,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">-if ( 'post' == $post_type || 'page' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'post' === $post_type || 'page' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $inserting_media = '<p>' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the “Create a new gallery” button.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $inserting_media .= '<p>' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. <a href="https://wordpress.org/support/article/embeds/">Learn more about embeds</a>.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +364,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">-if ( 'post' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'post' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $publish_box = '<p>' . __( 'Several boxes on this screen contain settings for how your content will be published, including:' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $publish_box .= '<ul><li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> __( '<strong>Publish</strong> — You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). The Password protected option allows you to set an arbitrary password for each post. The Private option hides the post from everyone except editors and administrators. Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.' ) .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,7 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => $discussion_settings,
</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">-} elseif ( 'page' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'page' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_attributes = '<p>' . __( '<strong>Parent</strong> — You can arrange your pages in hierarchies. For example, you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how many levels you can nest pages.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<strong>Template</strong> — Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you’ll see them in this dropdown menu.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<strong>Order</strong> — Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.' ) . '</p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="active_post_lock" value="<?php echo esc_attr( implode( ':', $active_post_lock ) ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'draft' != get_post_status( $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'draft' !== get_post_status( $post ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_original_referer_field( true, 'previous' );
</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">@@ -495,7 +495,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"> <div id="poststuff">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="post-body" class="metabox-holder columns-<?php echo ( 1 === get_current_screen()->get_columns() ) ? '1' : '2'; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="post-body-content">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( post_type_supports( $post_type, 'title' ) ) { ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,12 +535,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $shortlink = wp_get_shortlink( $post->ID, 'post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $shortlink ) && $shortlink !== $permalink && home_url( '?page_id=' . $post->ID ) !== $permalink ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" /><button type="button" class="button button-small" onclick="prompt('URL:', jQuery(\'#shortlink\').val());">' . __( 'Get Shortlink' ) . '</button>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" />' .
+ '<button type="button" class="button button-small" onclick="prompt('URL:', jQuery(\'#shortlink\').val());">' .
+ __( 'Get Shortlink' ) .
+ '</button>';
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
- $has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_type_object->public
+ && ! ( 'pending' === get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) )
+ ) {
+ $has_sample_permalink = $sample_permalink_html && 'auto-draft' !== $post->post_status;
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="edit-slug-box" class="hide-if-no-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,7 +613,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="autosave-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="autosave-message"> </span>
</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">- if ( 'auto-draft' != $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'auto-draft' !== $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<span id="last-edit">';
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $last_user ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,7 +647,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="postbox-container-1" class="postbox-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'page' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'page' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before meta boxes with 'side' context are output for the 'page' post type.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +681,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do_meta_boxes( null, 'normal', $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">-if ( 'page' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'page' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after 'normal' context meta boxes have been output for the 'page' post type.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadmineditformcommentphp"></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/edit-form-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-comment.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/edit-form-comment.php 2020-05-12 18:30:03 UTC (rev 47785)
</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"> <label><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php _ex( 'Spam', 'comment status' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .misc-pub-section -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $submitted = sprintf(
</span></span></pre></div>
<a id="trunksrcwpadmineditlinkformphp"></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/edit-link-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-link-form.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/edit-link-form.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="poststuff">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="post-body" class="metabox-holder columns-<?php echo ( 1 === get_current_screen()->get_columns() ) ? '1' : '2'; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="post-body-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="namediv" class="stuffbox">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><label for="link_name"><?php _ex( 'Name', 'link name' ); ?></label></h2>
</span></span></pre></div>
<a id="trunksrcwpadminedittagformphp"></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/edit-tag-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tag-form.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/edit-tag-form.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,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"> // Back compat hooks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'category' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before the Edit Category form.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Term $tag Current category term object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_deprecated( 'edit_category_form_pre', array( $tag ), '3.0.0', '{$taxonomy}_pre_edit_form' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( 'link_category' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'link_category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before the Edit Link Category form.
</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"> $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_categories( $dropdown_args );
</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 if ( 'category' == $taxonomy ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'category' === $taxonomy ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat hooks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'category' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the Edit Category form fields are displayed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Term $tag Current category term object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_deprecated( 'edit_category_form_fields', array( $tag ), '3.0.0', '{$taxonomy}_edit_form_fields' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'link_category' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'link_category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the Edit Link Category form fields are displayed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,10 +239,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat hooks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'category' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/edit-tags.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_deprecated( 'edit_category_form', array( $tag ), '3.0.0', '{$taxonomy}_add_form' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( 'link_category' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'link_category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/edit-tags.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_deprecated( 'edit_link_category_form', array( $tag ), '3.0.0', '{$taxonomy}_add_form' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></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/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/edit.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages['post'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of posts. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'locked' => ( 1 === $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of posts. */
</span><span class="cx" style="display: block; padding: 0 10px"> _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of posts. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,7 +345,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages['page'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of pages. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'locked' => ( 1 === $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of pages. */
</span><span class="cx" style="display: block; padding: 0 10px"> _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of pages. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +358,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages['wp_block'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of blocks. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => _n( '%s block updated.', '%s blocks updated.', $bulk_counts['updated'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 block not updated, somebody is editing it.' ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'locked' => ( 1 === $bulk_counts['locked'] ) ? __( '1 block not updated, somebody is editing it.' ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of blocks. */
</span><span class="cx" style="display: block; padding: 0 10px"> _n( '%s block not updated, somebody is editing it.', '%s blocks not updated, somebody is editing them.', $bulk_counts['locked'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of blocks. */
</span></span></pre></div>
<a id="trunksrcwpadminexportphp"></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/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/export.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/export.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,9 +62,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['download'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = 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">- if ( ! isset( $_GET['content'] ) || 'all' == $_GET['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_GET['content'] ) || 'all' === $_GET['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'all';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'posts' == $_GET['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'posts' === $_GET['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'post';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_GET['cat'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_GET['post_status'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['status'] = $_GET['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">- } elseif ( 'pages' == $_GET['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'pages' === $_GET['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'page';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_GET['page_author'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_GET['page_status'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['status'] = $_GET['page_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">- } elseif ( 'attachment' == $_GET['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'attachment' === $_GET['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'attachment';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_GET['attachment_start_date'] || $_GET['attachment_end_date'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,18 +144,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = %s AND post_status != 'auto-draft'
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY post_date DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ",
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type
</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"> $month_count = count( $months );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $month_count || ( 1 === $month_count && 0 === (int) $months[0]->month ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $months as $date ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 == $date->year ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === (int) $date->year ) {
</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="trunksrcwpadminimportphp"></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/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/import.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $importer_id = $popular_importers[ $_GET['invalid'] ]['importer-id'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $importer_id != $_GET['invalid'] ) { // Prevent redirect loops.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $importer_id !== $_GET['invalid'] ) { // Prevent redirect loops.
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'admin.php?import=' . $importer_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/includes/upgrade.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2346,7 +2346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $table_name ) );
</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 ( $wpdb->get_var( $query ) == $table_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wpdb->get_var( $query ) === $table_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2354,9 +2354,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $create_ddl );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We cannot directly tell that whether this succeeded!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wpdb->get_var( $query ) == $table_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wpdb->get_var( $query ) === $table_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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"> return false;
</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">@@ -2373,13 +2374,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function drop_index( $table, $index ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->hide_errors();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "ALTER TABLE `$table` DROP INDEX `$index`" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Now we need to take out all the extra ones we may have created.
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 25; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "ALTER TABLE `$table` DROP INDEX `{$index}_$i`" );
</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"> $wpdb->show_errors();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2396,8 +2402,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_clean_index( $table, $index ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> drop_index( $table, $index );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "ALTER TABLE `$table` ADD INDEX ( `$index` )" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2415,8 +2423,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function maybe_add_column( $table_name, $column_name, $create_ddl ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $column == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $column === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2426,10 +2435,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We cannot directly tell that whether this succeeded!
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $column == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $column === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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="trunksrcwpadmininstallhelperphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install-helper.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install-helper.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/install-helper.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,20 +51,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function maybe_create_table( $table_name, $create_ddl ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->get_col( 'SHOW TABLES', 0 ) as $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $table == $table_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $table === $table_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Didn't find it, so try to create it.
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $create_ddl );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We cannot directly tell that whether this succeeded!
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->get_col( 'SHOW TABLES', 0 ) as $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $table == $table_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $table === $table_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,9 +87,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function maybe_add_column( $table_name, $column_name, $create_ddl ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( $column == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $column === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,10 +99,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We cannot directly tell that whether this succeeded!
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $column == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $column === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,8 +122,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function maybe_drop_column( $table_name, $column_name, $drop_ddl ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $column == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $column === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Found it, so try to drop it.
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $drop_ddl );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,12 +131,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We cannot directly tell that whether this succeeded!
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $column == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $column === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Else didn't find it.
</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">@@ -167,34 +173,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_column( $table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $diffs = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $wpdb->get_results( "DESC $table_name" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $row ) {
</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 ( $row->Field == $col_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $row->Field === $col_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Got our column, check the params.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( null != $col_type ) && ( $row->Type != $col_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null !== $col_type ) && ( $row->Type !== $col_type ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</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 ( ( null != $is_null ) && ( $row->Null != $is_null ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null !== $is_null ) && ( $row->Null !== $is_null ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</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 ( ( null != $key ) && ( $row->Key != $key ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null !== $key ) && ( $row->Key !== $key ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</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 ( ( null != $default ) && ( $row->Default != $default ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null !== $default ) && ( $row->Default !== $default ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</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 ( ( null != $extra ) && ( $row->Extra != $extra ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null !== $extra ) && ( $row->Extra !== $extra ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</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"> if ( $diffs > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> } // End if found our column.
</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"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/install.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,8 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function display_setup_form( $error = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sql = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->users ) );
- $user_table = ( $wpdb->get_var( $sql ) != null );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_table = ( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->users ) ) ) !== null );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure that sites appear in search engines by default.
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_public = 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,10 +368,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: Poka-yoke.
</span><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'Please provide a valid username.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( sanitize_user( $user_name, true ) != $user_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( sanitize_user( $user_name, true ) !== $user_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'The username you provided has invalid characters.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $admin_password != $admin_password_check ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $admin_password !== $admin_password_check ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // TODO: Poka-yoke.
</span><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span></span></pre></div>
<a id="trunksrcwpadminlinkmanagerphp"></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/link-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-manager.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/link-manager.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = admin_url( 'link-manager.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $bulklinks = (array) $_REQUEST['linkcheck'];
</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 ( 'delete' == $doaction ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'delete' === $doaction ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $bulklinks as $link_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_id = (int) $link_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminlinkparseopmlphp"></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/link-parse-opml.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-parse-opml.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/link-parse-opml.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,14 +27,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $descriptions
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $feeds
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param resource $parser XML Parser resource.
- * @param string $tagName XML element name.
- * @param array $attrs XML element attributes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param resource $parser XML Parser resource.
+ * @param string $tag_name XML element name.
+ * @param array $attrs XML element attributes.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function startElement( $parser, $tagName, $attrs ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function startElement( $parser, $tag_name, $attrs ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
</ins><span class="cx" style="display: block; padding: 0 10px"> global $names, $urls, $targets, $descriptions, $feeds;
</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 ( 'OUTLINE' === $tagName ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'OUTLINE' === $tag_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $attrs['TEXT'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $name = $attrs['TEXT'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,10 +65,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param resource $parser XML Parser resource.
- * @param string $tagName XML tag name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param resource $parser XML Parser resource.
+ * @param string $tag_name XML tag name.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function endElement( $parser, $tagName ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function endElement( $parser, $tag_name ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
</ins><span class="cx" style="display: block; padding: 0 10px"> // Nothing to do.
</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="trunksrcwpadminlinkphp"></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/link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/link.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-bookmarks' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For each link id (in $linkcheck[]) change category to selected value.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( count( $linkcheck ) == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( count( $linkcheck ) === 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $this_file );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-bookmarks' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For each link id (in $linkcheck[]) change category to selected value.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( count( $linkcheck ) == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( count( $linkcheck ) === 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $this_file );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminloadstylesphp"></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/load-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-styles.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/load-styles.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</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">-$rtl = ( isset( $_GET['dir'] ) && 'rtl' == $_GET['dir'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$rtl = ( isset( $_GET['dir'] ) && 'rtl' === $_GET['dir'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expires_offset = 31536000; // 1 year.
</span><span class="cx" style="display: block; padding: 0 10px"> $out = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminmediauploadphp"></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/media-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media-upload.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/media-upload.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,11 +29,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // IDs should be integers.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$ID = isset( $ID ) ? (int) $ID : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$ID = isset( $ID ) ? (int) $ID : 0; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = isset( $post_id ) ? (int) $post_id : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Require an ID for the edit screen.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset( $action ) && 'edit' == $action && ! $ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $action ) && 'edit' === $action && ! $ID ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Invalid item ID.' ) . '</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body_id = 'media-upload';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let the action code decide how to handle the request.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'type' == $tab || 'type_url' == $tab || ! array_key_exists( $tab, media_upload_tabs() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'type' === $tab || 'type_url' === $tab || ! array_key_exists( $tab, media_upload_tabs() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires inside specific upload-type views in the legacy (pre-3.5.0)
</span><span class="cx" style="display: block; padding: 0 10px"> * media popup based on the current tab.
</span></span></pre></div>
<a id="trunksrcwpadminmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/media.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $location = 'media.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = wp_get_original_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $referer ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $referer, 'upload.php' ) || ( url_to_postid( $referer ) == $attachment_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== strpos( $referer, 'upload.php' ) || ( url_to_postid( $referer ) === $attachment_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = $referer;
</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">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' !== $att->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You attempted to edit an item that isn’t an attachment. Please go back and try again.' ) );
</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 ( 'trash' == $att->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $att->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) );
</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="trunksrcwpadminmenuheaderphp"></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/menu-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu-header.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/menu-header.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_items = $submenu[ $item[2] ];
</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 ( ( $parent_file && $item[2] == $parent_file ) || ( empty( $typenow ) && $self == $item[2] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( $parent_file && $item[2] === $parent_file ) || ( empty( $typenow ) && $self === $item[2] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $submenu_items ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'wp-has-current-submenu wp-menu-open';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,10 +154,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = $submenu_items[0][2];
</span><span class="cx" style="display: block; padding: 0 10px"> $pos = strpos( $menu_file, '?' );
</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 ( false !== $pos ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = substr( $menu_file, 0, $pos );
</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 ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! empty( $menu_hook )
+ || ( ( 'index.php' !== $submenu_items[0][2] )
+ && file_exists( WP_PLUGIN_DIR . "/$menu_file" )
+ && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_is_parent = true;
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,10 +173,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = $item[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $pos = strpos( $menu_file, '?' );
</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 ( false !== $pos ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = substr( $menu_file, 0, $pos );
</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 ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! empty( $menu_hook )
+ || ( ( 'index.php' !== $item[2] )
+ && file_exists( WP_PLUGIN_DIR . "/$menu_file" )
+ && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_is_parent = true;
</span><span class="cx" style="display: block; padding: 0 10px"> echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,6 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $class = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_attributes = '';
</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 ( $first ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'wp-first-item';
</span><span class="cx" style="display: block; padding: 0 10px"> $first = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,8 +211,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = $item[2];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = strpos( $menu_file, '?' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pos = strpos( $menu_file, '?' );
</del><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $pos ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = substr( $menu_file, 0, $pos );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $submenu_file ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $submenu_file == $sub_item[2] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $submenu_file === $sub_item[2] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'current';
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_attributes .= ' aria-current="page"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,8 +228,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If plugin_page is set the parent must either match the current page or not physically exist.
</span><span class="cx" style="display: block; padding: 0 10px"> // This allows plugin pages with the same hook to exist under different parents.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
- ( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists( $menu_file ) === false ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( ! isset( $plugin_page ) && $self === $sub_item[2] )
+ || ( isset( $plugin_page ) && $plugin_page === $sub_item[2]
+ && ( $item[2] === $self_type || $item[2] === $self || file_exists( $menu_file ) === false ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'current';
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_attributes .= ' aria-current="page"';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +251,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = wptexturize( $sub_item[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">- if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $menu_hook )
+ || ( ( 'index.php' !== $sub_item[2] )
+ && file_exists( WP_PLUGIN_DIR . "/$sub_file" )
+ && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If admin.php is the current page or if the parent exists as a file in the plugins or admin directory.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
</span></span></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></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/ms-delete-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/ms-delete-site.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/ms-delete-site.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to delete this site.' ) );
</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( $_GET['h'] ) && '' != $_GET['h'] && false != get_option( 'delete_blog_hash' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['h'] ) && '' !== $_GET['h'] && false !== get_option( 'delete_blog_hash' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( get_current_blog_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="wrap">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h1>' . esc_html( $title ) . '</h1>';
</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( $_POST['action'] ) && 'deleteblog' == $_POST['action'] && isset( $_POST['confirmdelete'] ) && '1' == $_POST['confirmdelete'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_POST['action'] ) && 'deleteblog' === $_POST['action'] && isset( $_POST['confirmdelete'] ) && '1' === $_POST['confirmdelete'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'delete-blog' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = wp_generate_password( 20, false );
</span></span></pre></div>
<a id="trunksrcwpadminmysitesphp"></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/my-sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/my-sites.php 2020-05-12 16:43:42 UTC (rev 47784)
+++ trunk/src/wp-admin/my-sites.php 2020-05-12 18:30:03 UTC (rev 47785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $current_user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updated = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'updateblogsettings' === $action && isset( $_POST['primary_blog'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'update-my-sites' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_site( (int) $_POST['primary_blog'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,10 +107,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context Context of the setting (global or site-specific). Default 'global'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $settings_html = apply_filters( 'myblogs_options', '', 'global' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $settings_html ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $settings_html ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<h3>' . __( 'Global Settings' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo $settings_html;
</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"> reset( $blogs );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blogs as $user_blog ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,10 +136,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $user_blog An object containing the site data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = apply_filters( 'myblogs_blog_actions', $actions, $user_blog );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "<p class='my-sites-actions'>" . $actions . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/my-sites.php */
</span><span class="cx" style="display: block; padding: 0 10px"> echo apply_filters( 'myblogs_options', '', $user_blog );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</li>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span></span></pre>
</div>
</div>
</body>
</html>