WordPress 4.2.4

[autoinstalls/wordpress.git] / wp-admin / plugin-install.php

diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index b87193977fb291d1aee7b7ef7f0adf61cd46800e..be8e80f6582ebb3b50541427b073887a310d0e6d 100644 (file)
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -24,9 +24,28 @@ if ( is_multisite() && ! is_network_admin() ) {
 
 $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
+
+if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
+       $location = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+
+       if ( ! empty( $_REQUEST['paged'] ) ) {
+               $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+       }
+
+       wp_redirect( $location );
+       exit;
+}
+
 $wp_list_table->prepare_items();
 
-$title = __('Install Plugins');
+$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+
+if ( $pagenum > $total_pages && $total_pages > 0 ) {
+       wp_redirect( add_query_arg( 'paged', $total_pages ) );
+       exit;
+}
+
+$title = __( 'Add Plugins' );
 $parent_file = 'plugins.php';
 
 wp_enqueue_script( 'plugin-install' );
@@ -35,10 +54,12 @@ if ( 'plugin-information' != $tab )
 
 $body_id = $tab;
 
+wp_enqueue_script( 'updates' );
+
 /**
  * Fires before each tab on the Install Plugins screen is loaded.
  *
- * The dynamic portion of the action hook, $tab, allows for targeting
+ * The dynamic portion of the action hook, `$tab`, allows for targeting
  * individual tabs, for instance 'install_plugins_pre_plugin-information'.
  *
  * @since 2.7.0
@@ -56,14 +77,14 @@ get_current_screen()->add_help_tab( array(
 'title'                => __('Adding Plugins'),
 'content'      =>
        '<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
-       '<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured, Popular, and Newest plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
+       '<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
        '<p>' . __('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' .
        '<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
-       '<p>' . __('<a href="http://codex.wordpress.org/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</a>') . '</p>' .
+       '<p>' . __('<a href="https://codex.wordpress.org/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</a>') . '</p>' .
        '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
@@ -73,26 +94,44 @@ get_current_screen()->set_help_sidebar(
 include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
-
-<?php $wp_list_table->views(); ?>
+<h2>
+       <?php
+       echo esc_html( $title );
+       if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
+               if ( $tab === 'upload' ) {
+                       $href = self_admin_url( 'plugin-install.php' );
+                       $text = _x( 'Browse', 'plugins' );
+               } else {
+                       $href = self_admin_url( 'plugin-install.php?tab=upload' );
+                       $text = __( 'Upload Plugin' );
+               }
+               echo ' <a href="' . $href . '" class="upload add-new-h2">' . $text . '</a>';
+       }
+       ?>
+</h2>
 
-<br class="clear" />
 <?php
+if ( $tab !== 'upload' ) {
+       $wp_list_table->views();
+       echo '<br class="clear" />';
+}
+
 /**
  * Fires after the plugins list table in each tab of the Install Plugins screen.
  *
- * The dynamic portion of the action hook, $tab, allows for targeting
+ * The dynamic portion of the action hook, `$tab`, allows for targeting
  * individual tabs, for instance 'install_plugins_plugin-information'.
  *
  * @since 2.7.0
  *
  * @param int $paged The current page number of the plugins list table.
  */
-?>
-<?php do_action( "install_plugins_$tab", $paged ); ?>
+do_action( "install_plugins_$tab", $paged ); ?>
 </div>
+
 <?php
+wp_print_request_filesystem_credentials_modal();
+
 /**
  * WordPress Administration Template Footer.
  */