WordPress.org

Make WordPress Core

Ticket #15525: 15525.2.patch

File 15525.2.patch, 6.2 KB (added by ocean90, 8 years ago)
  • wp-includes/admin-bar.php

     
    275275
    276276        $update_title = sprintf( __('Updates %s'), "<span id='ab-updates' class='count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" );
    277277
    278         $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => admin_url('update-core.php') ) );
     278        $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
     279
     280        $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => $href ) );
    279281}
    280282
    281283/**
  • wp-admin/includes/update.php

     
    9898        if ( ! isset( $cur->response ) )
    9999                $cur->response = '';
    100100
     101        $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
     102       
    101103        switch ( $cur->response ) {
    102104        case 'development' :
    103                 return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update-core.php');
     105                return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], $href );
    104106        break;
    105107
    106108        case 'upgrade' :
    107                 return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current);
     109                return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', $href, $cur->current);
    108110        break;
    109111
    110112        case 'latest' :
     
    129131        if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
    130132                return false;
    131133
    132         if ( current_user_can('update_core') )
    133                 $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' );
    134         else
     134        if ( current_user_can('update_core') ) {
     135                $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
     136
     137                $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, $href );
     138        } else
    135139                $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
    136140
    137141        echo "<div class='update-nag'>$msg</div>";
     
    146150        $cur = get_preferred_from_update_core();
    147151
    148152        $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
    149         if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') )
    150                 $msg .= " <a href='update-core.php' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
    151153
     154        if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) {
     155                $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
     156                $msg .= " <a href='" . $href . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
     157        }
     158
    152159        echo "<span id='wp-version-message'>$msg</span>";
    153160}
    154161
  • wp-admin/theme-editor.php

     
    99/** WordPress Administration Bootstrap */
    1010require_once('./admin.php');
    1111
     12if ( is_multisite() && ! is_network_admin() )
     13        wp_redirect( network_admin_url( 'theme-editor.php') );
     14
    1215if ( !current_user_can('edit_themes') )
    1316        wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
    1417
  • wp-admin/plugin-install.php

     
    1212/** WordPress Administration Bootstrap */
    1313require_once('./admin.php');
    1414
     15if ( is_multisite() && ! is_network_admin() )
     16        wp_redirect( network_admin_url( 'plugin-install.php') );
     17
    1518$wp_list_table = get_list_table('WP_Plugin_Install_List_Table');
    1619$wp_list_table->check_permissions();
    1720$wp_list_table->prepare_items();
  • wp-admin/theme-install.php

     
    99/** WordPress Administration Bootstrap */
    1010require_once('./admin.php');
    1111
     12if ( is_multisite() && ! is_network_admin() )
     13        wp_redirect( network_admin_url( 'theme-install.php') );
     14
    1215$wp_list_table = get_list_table('WP_Theme_Install_List_Table');
    1316$wp_list_table->check_permissions();
    1417$wp_list_table->prepare_items();
  • wp-admin/update-core.php

     
    99/** WordPress Administration Bootstrap */
    1010require_once('./admin.php');
    1111
     12if ( is_multisite() && ! is_network_admin() )
     13        wp_redirect( network_admin_url( 'update-core.php') );
     14
    1215if ( ! current_user_can('update_plugins') )
    1316        wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
    1417
     
    327330        }
    328331?>
    329332        <div class="wrap">
    330         <?php screen_icon(); ?>
     333        <?php screen_icon( 'tools' ); ?>
    331334        <h2><?php _e('Update WordPress'); ?></h2>
    332335<?php
    333336        if ( $wp_filesystem->errors->get_error_code() ) {
  • wp-admin/plugin-editor.php

     
    99/** WordPress Administration Bootstrap */
    1010require_once('./admin.php');
    1111
     12if ( is_multisite() && ! is_network_admin() )
     13        wp_redirect( network_admin_url( 'plugin-editor.php') );
     14
    1215if ( !current_user_can('edit_plugins') )
    1316        wp_die( __('You do not have sufficient permissions to edit plugins for this site.') );
    1417