Changeset 21501

Timestamp:

08/13/2012 04:18:42 PM (12 years ago)

Author:

nacin

Message:

Hide the link manager from the UI on upgrade, if the site has no links. New DB option, link_manager_enabled.

Enforce this by denying the 'manage_links' capability, which hides the All Links, Add New Link, and Link Categories screens. Hide WP_Widget_Links and the UI for the default_link_category as well.

Convert all references to 'posts and links' when handling reassignment on user deletion to just 'posts'.

see #21307.

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-admin/network/users.php (modified) (3 diffs)
• wp-admin/options-writing.php (modified) (2 diffs)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/default-widgets.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -482 +482 @@
     // 3.1
     'default_post_format' => 0,
+
+    // 3.5
+    'link_manager_enabled' => 0,
     );
 

trunk/wp-admin/includes/upgrade.php

@@ -400 +400 @@
         upgrade_340();
 
+    if ( $wp_current_db_version < 21501 )
+        upgrade_350();
+
     maybe_disable_automattic_widgets();
 
@@ -1180 +1183 @@
         }
     }
+}
+
+/**
+ * Execute changes made in WordPress 3.5.
+ *
+ * @since 3.5.0
+ */
+function upgrade_350() {
+    global $wp_current_db_version, $wpdb;
+
+    if ( $wp_current_db_version < 21501 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
+        update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
 }
 

trunk/wp-admin/network/users.php

@@ -25 +25 @@
     ?>
     <h2><?php esc_html_e( 'Users' ); ?></h2>
-    <p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p>
+    <p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
     <form action="users.php?action=dodelete" method="post">
     <input type="hidden" name="dodelete" />
@@ -48 +48 @@
             if ( !empty( $blogs ) ) {
                 ?>
-                <br /><fieldset><p><legend><?php printf( __( "What should be done with posts and links owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
+                <br /><fieldset><p><legend><?php printf( __( "What should be done with posts owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
                 <?php
                 foreach ( (array) $blogs as $key => $details ) {
@@ -68 +68 @@
                             <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
                             <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
-                            <?php _e( 'Delete all posts and links.' ); ?></label></li>
+                            <?php _e( 'Delete all posts.' ); ?></label></li>
                             <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
-                            <?php echo __( 'Attribute all posts and links to:' ) . '</label>' . $user_dropdown; ?></li>
+                            <?php echo __( 'Attribute all posts to:' ) . '</label>' . $user_dropdown; ?></li>
                         </ul>
                         <?php

trunk/wp-admin/options-writing.php

@@ -108 +108 @@
 </td>
 </tr>
-<?php endif; endif; ?>
+<?php endif; endif;
+
+if ( get_option( 'link_manager_enabled' ) ) :
+?>
 <tr valign="top">
 <th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
@@ -117 +120 @@
 </td>
 </tr>
+<?php endif; ?>
+
 <?php do_settings_fields('writing', 'default'); ?>
 </table>

trunk/wp-admin/users.php

@@ -213 +213 @@
     </ul>
 <?php if ( $go_delete ) : ?>
-    <fieldset><p><legend><?php echo _n( 'What should be done with posts and links owned by this user?', 'What should be done with posts and links owned by these users?', $go_delete ); ?></legend></p>
+    <fieldset><p><legend><?php echo _n( 'What should be done with posts owned by this user?', 'What should be done with posts owned by these users?', $go_delete ); ?></legend></p>
     <ul style="list-style:none;">
         <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
-        <?php _e('Delete all posts and links.'); ?></label></li>
+        <?php _e('Delete all posts.'); ?></label></li>
         <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-        <?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:').'</label>';
+        <?php echo '<label for="delete_option1">'.__('Attribute all posts to:').'</label>';
         wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
     </ul></fieldset>

trunk/wp-includes/capabilities.php

@@ -1227 +1227 @@
             $caps[] = 'do_not_allow';
         break;
+    case 'manage_links' :
+        if ( get_option( 'link_manager_enabled' ) )
+            $caps[] = $cap;
+        else
+            $caps[] = 'do_not_allow';
+        break;
     default:
         // Handle meta capabilities for custom post types.

trunk/wp-includes/default-widgets.php

@@ -1159 +1159 @@
     register_widget('WP_Widget_Archives');
 
-    register_widget('WP_Widget_Links');
+    if ( get_option( 'link_manager_enabled' ) )
+        register_widget('WP_Widget_Links');
 
     register_widget('WP_Widget_Meta');

trunk/wp-includes/taxonomy.php

@@ -89 +89 @@
             'add_or_remove_items' => null,
             'choose_from_most_used' => null,
+        ),
+        'capabilities' => array(
+            'manage_terms' => 'manage_links',
+            'edit_terms'   => 'manage_links',
+            'delete_terms' => 'manage_links',
+            'assign_terms' => 'manage_links',
         ),
         'query_var' => false,

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 20596;
+$wp_db_version = 21501;
 
 /**