Make WordPress Core


Ignore:
Timestamp:
01/14/2010 02:02:19 AM (15 years ago)
Author:
wpmuguru
Message:

merge wp-admin user, plugins, themes, upgrade , See #11644

Location:
trunk/wp-admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin

    • Property svn:ignore set to
      .themes.php.swp
      .user-edit.php.swp
      .user-new.php.swp
      .users.php.swp
  • trunk/wp-admin/plugins.php

    r12673 r12722  
    232232
    233233$help = '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>';
     234if ( !is_multisite() || is_super_admin() ) {
    234235$help .= '<p>' . sprintf(__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>';
    235236$help .= '<p>' . sprintf(__('You can find additional plugins for your site by using the new <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> directly and installing manually.  To <em>manually</em> install a plugin you generally just need to upload the plugin file into your <code>%2$s</code> directory.  Once a plugin has been installed, you may activate it here.'), 'plugin-install.php', WP_PLUGIN_DIR) . '</p>';
     237}
    236238
    237239add_contextual_help('plugins', $help);
     
    283285<div class="wrap">
    284286<?php screen_icon(); ?>
    285 <h2><?php echo esc_html( $title ); ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a></h2>
    286 
    287 <?php
    288 
    289 $all_plugins = get_plugins();
     287<h2><?php echo esc_html( $title ); if ( !is_multisite() || is_super_admin() ) { ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a><?php } ?></h2>
     288
     289<?php
     290
     291$all_plugins = apply_filters( 'all_plugins', get_plugins() );
    290292$search_plugins = array();
    291293$active_plugins = array();
     
    322324    if ( isset( $current->response[ $plugin_file ] ) )
    323325        $upgrade_plugins[ $plugin_file ] = $plugin_data;
     326}
     327
     328if ( is_multisite() && !is_super_admin() ) {
     329    $upgrade_plugins = false;
    324330}
    325331
     
    516522</form>
    517523
     524<?php do_action( 'pre_current_active_plugins', $all_plugins ) ?>
     525
    518526<form method="post" action="<?php echo admin_url('plugins.php') ?>">
    519527<?php wp_nonce_field('bulk-manage-plugins') ?>
Note: See TracChangeset for help on using the changeset viewer.