<!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>[45453] trunk/src/wp-admin: Privacy: Remove reinstated `wp-admin/options-privacy.php` from `$_old_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/45453">45453</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/45453","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>2019-05-27 02:39:46 +0000 (Mon, 27 May 2019)</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'>Privacy: Remove reinstated `wp-admin/options-privacy.php` from `$_old_files`.
Fix WPCS violations in <a href="https://core.trac.wordpress.org/changeset/45448">[45448]</a>.
See <a href="https://core.trac.wordpress.org/ticket/43895">#43895</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludeslisttablephp">trunk/src/wp-admin/includes/list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminoptionsprivacyphp">trunk/src/wp-admin/options-privacy.php</a></li>
<li><a href="#trunksrcwpadmintoolsphp">trunk/src/wp-admin/tools.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludeslisttablephp"></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/list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/list-table.php 2019-05-26 23:20:56 UTC (rev 45452)
+++ trunk/src/wp-admin/includes/list-table.php 2019-05-27 02:39:46 UTC (rev 45453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,22 +22,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _get_list_table( $class, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $core_classes = array(
</span><span class="cx" style="display: block; padding: 0 10px"> //Site Admin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_Posts_List_Table' => 'posts',
- 'WP_Media_List_Table' => 'media',
- 'WP_Terms_List_Table' => 'terms',
- 'WP_Users_List_Table' => 'users',
- 'WP_Comments_List_Table' => 'comments',
- 'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ),
- 'WP_Links_List_Table' => 'links',
- 'WP_Plugin_Install_List_Table' => 'plugin-install',
- 'WP_Themes_List_Table' => 'themes',
- 'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),
- 'WP_Plugins_List_Table' => 'plugins',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_Posts_List_Table' => 'posts',
+ 'WP_Media_List_Table' => 'media',
+ 'WP_Terms_List_Table' => 'terms',
+ 'WP_Users_List_Table' => 'users',
+ 'WP_Comments_List_Table' => 'comments',
+ 'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ),
+ 'WP_Links_List_Table' => 'links',
+ 'WP_Plugin_Install_List_Table' => 'plugin-install',
+ 'WP_Themes_List_Table' => 'themes',
+ 'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),
+ 'WP_Plugins_List_Table' => 'plugins',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Network Admin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'WP_MS_Sites_List_Table' => 'ms-sites',
- 'WP_MS_Users_List_Table' => 'ms-users',
- 'WP_MS_Themes_List_Table' => 'ms-themes',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WP_MS_Sites_List_Table' => 'ms-sites',
+ 'WP_MS_Users_List_Table' => 'ms-users',
+ 'WP_MS_Themes_List_Table' => 'ms-themes',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Privacy requests tables
</span><span class="cx" style="display: block; padding: 0 10px"> 'WP_Privacy_Data_Export_Requests_List_Table' => 'privacy-data-export-requests',
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2019-05-26 23:20:56 UTC (rev 45452)
+++ trunk/src/wp-admin/includes/update-core.php 2019-05-27 02:39:46 UTC (rev 45453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,7 +536,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/images/screenshots/twitter-embed-1.png',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/images/screenshots/twitter-embed-2.png',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/js/utils.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp-admin/options-privacy.php',
</del><span class="cx" style="display: block; padding: 0 10px"> 'wp-app.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/class-wp-atom-server.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',
</span></span></pre></div>
<a id="trunksrcwpadminoptionsprivacyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-privacy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-privacy.php 2019-05-26 23:20:56 UTC (rev 45452)
+++ trunk/src/wp-admin/options-privacy.php 2019-05-27 02:39:46 UTC (rev 45453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,11 +145,9 @@
</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"> $view_href = get_permalink( $privacy_policy_page_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="tools-privacy-edit"><strong>
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +163,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $view_href )
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +170,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +177,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="cx" style="display: block; padding: 0 10px"> ''
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +196,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> $has_pages = (bool) get_posts(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +212,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="set-privacy-page" />
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'page_for_privacy_policy',
</span></span></pre></div>
<a id="trunksrcwpadmintoolsphp"></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/tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/tools.php 2019-05-26 23:20:56 UTC (rev 45452)
+++ trunk/src/wp-admin/tools.php 2019-05-27 02:39:46 UTC (rev 45453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,25 +60,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php echo esc_html( $title ); ?></h1>
</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 ( current_user_can( 'import' ) ) :
- $cats = get_taxonomy( 'category' );
- $tags = get_taxonomy( 'post_tag' );
- if ( current_user_can( $cats->cap->manage_terms ) || current_user_can( $tags->cap->manage_terms ) ) :
- ?>
- <div class="card">
- <h2 class="title"><?php _e( 'Categories and Tags Converter' ); ?></h2>
- <p><?php printf( __( 'If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.' ), 'import.php' ); ?></p>
- </div>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( current_user_can( 'import' ) ) :
+ $cats = get_taxonomy( 'category' );
+ $tags = get_taxonomy( 'post_tag' );
+ if ( current_user_can( $cats->cap->manage_terms ) || current_user_can( $tags->cap->manage_terms ) ) :
+ ?>
+ <div class="card">
+ <h2 class="title"><?php _e( 'Categories and Tags Converter' ); ?></h2>
+ <p><?php printf( __( 'If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.' ), 'import.php' ); ?></p>
+ </div>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Fires at the end of the Tools Administration screen.
- *
- * @since 2.8.0
- */
- do_action( 'tool_box' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Fires at the end of the Tools Administration screen.
+ *
+ * @since 2.8.0
+ */
+do_action( 'tool_box' );
</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"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>