Changeset 8060

Timestamp:

06/06/2008 07:21:35 PM (18 years ago)

Author:

ryan

Message:

Add delete_plugins and update_plugins caps. Props DD32. fixes #7096

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (3 diffs)
• wp-admin/includes/update.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-admin/plugins.php (modified) (3 diffs)
• wp-admin/update.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -258 +258 @@
 
     // Delete unused options
-    $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval');
+    $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins');
     foreach ($unusedoptions as $option) :
         delete_option($option);
@@ -275 +275 @@
     populate_roles_230();
     populate_roles_250();
+    populate_roles_260();
 }
 
@@ -430 +431 @@
 }
 
+function populate_roles_260() {
+    $role = get_role( 'administrator' );
+
+    if ( !empty( $role ) ) {
+        $role->add_cap( 'update_plugins' );
+        $role->add_cap( 'delete_plugins' );
+    }
+}
+
 ?>

trunk/wp-admin/includes/update.php

@@ -127 +127 @@
 
     echo '<tr><td colspan="5" class="plugin-update">';
-    if ( !current_user_can('edit_plugins') )
+    if ( ! current_user_can('update_plugins') )
         printf( __('There is a new version of %1$s available. <a href="%2$s">Download version %3$s here</a>.'), $plugin_data['Name'], $r->url, $r->new_version);
     else if ( empty($r->package) )

trunk/wp-admin/includes/upgrade.php

@@ -208 +208 @@
     if ( $wp_current_db_version < 7935 )
         upgrade_252();
+
+    if ( $wp_current_db_version < 8000 )
+        upgrade_260();
 
     maybe_disable_automattic_widgets();
@@ -741 +744 @@
 
     $wpdb->query("UPDATE $wpdb->users SET user_activation_key = ''");
+}
+
+function upgrade_260() {
+    populate_roles_260();
 }
 

trunk/wp-admin/plugins.php

@@ -73 +73 @@
             break;
         case 'delete-selected':
+            if( ! current_user_can('delete_plugins') )
+                wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
             check_admin_referer('mass-manage-plugins');
             $plugins = $_REQUEST['checked'];
@@ -251 +253 @@
     <div class="alignleft">
         <input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" />
-<?php if( current_user_can('edit_plugins') ) : ?>
+<?php if( current_user_can('delete_plugins') ) : ?>
         <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" />
 <?php endif; ?>
@@ -268 +270 @@
     <div class="alignleft">
         <input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" />
-<?php if( current_user_can('edit_plugins') ) : ?>
+<?php if( current_user_can('delete_plugins') ) : ?>
         <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" />
 <?php endif; ?>

trunk/wp-admin/update.php

@@ -3 +3 @@
 require_once('admin.php');
 
-if ( !current_user_can('edit_plugins') )
-    wp_die('<p>'.__('You do not have sufficient permissions to update plugins for this blog.').'</p>');
+if ( ! current_user_can('update_plugins') )
+    wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
 
 function request_filesystem_credentials($form_post, $type = '', $error = false) {

trunk/wp-includes/version.php

@@ -17 +17 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 7935;
+$wp_db_version = 8000;
 
 ?>