Ticket #7096: 7096.diff

File 7096.diff, 6.6 kB (added by DD32, 6 months ago)

  • wp-admin/includes/schema.php

    old new  
    257257        add_option('avatar_default', 'mystery'); 
    258258 
    259259        // Delete unused options 
    260         $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'); 
     260        $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'); 
    261261        foreach ($unusedoptions as $option) : 
    262262                delete_option($option); 
    263263        endforeach; 
    …… 
    274274        populate_roles_210(); 
    275275        populate_roles_230(); 
    276276        populate_roles_250(); 
     277        populate_roles_260(); 
    277278} 
    278279 
    279280function populate_roles_160() { 
    …… 
    429430        } 
    430431} 
    431432 
     433function populate_roles_260() { 
     434        $role = get_role( 'administrator' ); 
     435 
     436        if ( !empty( $role ) ) { 
     437                $role->add_cap( 'update_plugins' ); 
     438                $role->add_cap( 'delete_plugins' ); 
     439        } 
     440} 
     441 
    432442?> 

  • wp-admin/includes/update.php

    old new  
    126126        $r = $current->response[ $file ]; 
    127127 
    128128        echo '<tr><td colspan="5" class="plugin-update">'; 
    129         if ( !current_user_can('edit_plugins') ) 
     129        if ( ! current_user_can('update_plugins') ) 
    130130                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); 
    131131        else if ( empty($r->package) ) 
    132132                printf( __('There is a new version of %1$s available. <a href="%2$s">Download version %3$s here</a> <em>automatic upgrade unavailable for this plugin</em>.'), $plugin_data['Name'], $r->url, $r->new_version); 

  • wp-admin/includes/upgrade.php

    old new  
    208208        if ( $wp_current_db_version < 7935 ) 
    209209                upgrade_252(); 
    210210 
     211        if ( $wp_current_db_version < 8000 ) 
     212                upgrade_260(); 
     213 
    211214        maybe_disable_automattic_widgets(); 
    212215 
    213216        $wp_rewrite->flush_rules(); 
    …… 
    742745        $wpdb->query("UPDATE $wpdb->users SET user_activation_key = ''"); 
    743746} 
    744747 
     748function upgrade_260() { 
     749        populate_roles_260(); 
     750} 
     751 
    745752// The functions we use to actually do stuff 
    746753 
    747754// General 

  • wp-admin/plugins.php

    old new  
    7272                        exit; 
    7373                        break; 
    7474                case 'delete-selected': 
     75                        if( ! current_user_can('delete_plugins') ) 
     76                                wp_die(__('You do not have sufficient permissions to delete plugins for this blog.')); 
    7577                        check_admin_referer('mass-manage-plugins'); 
    7678                        $plugins = $_REQUEST['checked']; 
    7779                        include(ABSPATH . 'wp-admin/update.php'); 
    …… 
    250252<div class="tablenav"> 
    251253        <div class="alignleft"> 
    252254                <input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" /> 
    253 <?php if( current_user_can('edit_plugins') ) : ?> 
     255<?php if( current_user_can('delete_plugins') ) : ?> 
    254256                <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" /> 
    255257<?php endif; ?> 
    256258        </div> 
    …… 
    267269<div class="tablenav"> 
    268270        <div class="alignleft"> 
    269271                <input type="submit" name="activate-selected" value="<?php _e('Activate') ?>" class="button-secondary" /> 
    270 <?php if( current_user_can('edit_plugins') ) : ?> 
     272<?php if( current_user_can('delete_plugins') ) : ?> 
    271273                <input type="submit" name="delete-selected" value="<?php _e('Delete') ?>" class="button-secondary" /> 
    272274<?php endif; ?> 
    273275        </div> 

  • wp-admin/update.php

    old new  
    22 
    33require_once('admin.php'); 
    44 
    5 if ( !current_user_can('edit_plugins') ) 
    6         wp_die('<p>'.__('You do not have sufficient permissions to update plugins for this blog.').'</p>'); 
     5if ( ! current_user_can('update_plugins') ) 
     6        wp_die(__('You do not have sufficient permissions to update plugins for this blog.')); 
    77 
    88function request_filesystem_credentials($form_post, $type = '', $error = false) { 
    99        $req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error); 

  • wp-includes/version.php

    old new  
    1616 * 
    1717 * @global int $wp_db_version 
    1818 */ 
    19 $wp_db_version = 7935; 
     19$wp_db_version = 8000; 
    2020 
    2121?>