Changeset 45453

Timestamp:

05/27/2019 02:39:46 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Remove reinstated wp-admin/options-privacy.php from $_old_files.

Fix WPCS violations in [45448].

See #43895.

Location:

trunk/src/wp-admin

Files:

• includes/list-table.php (modified) (1 diff)
• includes/update-core.php (modified) (1 diff)
• options-privacy.php (modified) (6 diffs)
• tools.php (modified) (1 diff)

trunk/src/wp-admin/includes/list-table.php

@@ -23 +23 @@
     $core_classes = array(
         //Site Admin
-        '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',
+        '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',
 
         // Network Admin
-        'WP_MS_Sites_List_Table'  => 'ms-sites',
-        'WP_MS_Users_List_Table'  => 'ms-users',
-        'WP_MS_Themes_List_Table' => 'ms-themes',
+        'WP_MS_Sites_List_Table'                      => 'ms-sites',
+        'WP_MS_Users_List_Table'                      => 'ms-users',
+        'WP_MS_Themes_List_Table'                     => 'ms-themes',
 
         // Privacy requests tables

trunk/src/wp-admin/includes/update-core.php

@@ -537 +537 @@
     'wp-admin/images/screenshots/twitter-embed-2.png',
     'wp-admin/js/utils.js',
-    'wp-admin/options-privacy.php',
     'wp-app.php',
     'wp-includes/class-wp-atom-server.php',

trunk/src/wp-admin/options-privacy.php

@@ -146 +146 @@
 
         $view_href = get_permalink( $privacy_policy_page_id );
-
         ?>
         <p class="tools-privacy-edit"><strong>
             <?php
-
             if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
                 printf(
@@ -166 +164 @@
                 );
             }
-
             ?>
         </strong></p>
@@ -174 +171 @@
     <p>
         <?php
-
         printf(
             /* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */
@@ -182 +178 @@
             ''
         );
-
         ?>
     </p>
@@ -202 +197 @@
             <td>
                 <?php
-                
                 $has_pages = (bool) get_posts(
                     array(
@@ -219 +213 @@
                         <input type="hidden" name="action" value="set-privacy-page" />
                         <?php
-                        
                         wp_dropdown_pages(
                             array(

trunk/src/wp-admin/tools.php

@@ -61 +61 @@
 <?php
 
-    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
+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
     endif;
-    endif;
+endif;
 
-    /**
-     * Fires at the end of the Tools Administration screen.
-     *
-     * @since 2.8.0
-     */
-    do_action( 'tool_box' );
+/**
+ * Fires at the end of the Tools Administration screen.
+ *
+ * @since 2.8.0
+ */
+do_action( 'tool_box' );
 
 ?>