WordPress 4.3

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-theme-install-list-table.php

diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php
index e991c4ec46b64ae684a060376705606b93963a8a..427c5391489953005444823e43370dc588e50e7d 100644 (file)
--- a/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -9,13 +9,25 @@
  */
 class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
  */
 class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 

-       var $features = array();
+       public $features = array();

 
 

-       function ajax_user_can() {
+       /**
+        *
+        * @return bool
+        */
+       public function ajax_user_can() {

                return current_user_can( 'install_themes' );
        }
 
                return current_user_can( 'install_themes' );
        }
 

-       function prepare_items() {
+       /**
+        *
+        * @global array  $tabs
+        * @global string $tab
+        * @global int    $paged
+        * @global string $type
+        * @global array  $theme_field_defaults
+        */
+       public function prepare_items() {

                include( ABSPATH . 'wp-admin/includes/theme-install.php' );
 
                global $tabs, $tab, $paged, $type, $theme_field_defaults;
                include( ABSPATH . 'wp-admin/includes/theme-install.php' );
 
                global $tabs, $tab, $paged, $type, $theme_field_defaults;


@@ -41,21 +53,14 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                if ( 'search' == $tab )
                        $tabs['search'] = __( 'Search Results' );
                $tabs['upload'] = __( 'Upload' );
                if ( 'search' == $tab )
                        $tabs['search'] = __( 'Search Results' );
                $tabs['upload'] = __( 'Upload' );

-               $tabs['featured'] = _x( 'Featured','Theme Installer' );
-               //$tabs['popular']  = _x( 'Popular','Theme Installer' );
-               $tabs['new']      = _x( 'Newest','Theme Installer' );
-               $tabs['updated']  = _x( 'Recently Updated','Theme Installer' );
+               $tabs['featured'] = _x( 'Featured', 'themes' );
+               //$tabs['popular']  = _x( 'Popular', 'themes' );
+               $tabs['new']      = _x( 'Latest', 'themes' );
+               $tabs['updated']  = _x( 'Recently Updated', 'themes' );

 
                $nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
 
 
                $nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
 

-               /**
-                * Filter the tabs shown on the Install Themes screen.
-                *
-                * @since 2.8.0
-                *
-                * @param array $tabs The tabs shown on the Install Themes screen. Defaults are
-                *                    'dashboard', 'search', 'upload', 'featured', 'new', and 'updated'.
-                */
+               /** This filter is documented in wp-admin/theme-install.php */

                $tabs = apply_filters( 'install_themes_tabs', $tabs );
 
                /**
                $tabs = apply_filters( 'install_themes_tabs', $tabs );
 
                /**


@@ -99,7 +104,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                                break;
 
                        case 'featured':
                                break;
 
                        case 'featured':

-                       //case 'popular':
+                       // case 'popular':

                        case 'new':
                        case 'updated':
                                $args['browse'] = $tab;
                        case 'new':
                        case 'updated':
                                $args['browse'] = $tab;


@@ -113,7 +118,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                /**
                 * Filter API request arguments for each Install Themes screen tab.
                 *
                /**
                 * Filter API request arguments for each Install Themes screen tab.
                 *

-                * The dynamic portion of the hook name, $tab, refers to the theme install
+                * The dynamic portion of the hook name, `$tab`, refers to the theme install

                 * tabs. Default tabs are 'dashboard', 'search', 'upload', 'featured',
                 * 'new', and 'updated'.
                 *
                 * tabs. Default tabs are 'dashboard', 'search', 'upload', 'featured',
                 * 'new', and 'updated'.
                 *


@@ -140,11 +145,20 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                ) );
        }
 
                ) );
        }
 

-       function no_items() {
+       /**
+        * @access public
+        */
+       public function no_items() {

                _e( 'No themes match your request.' );
        }
 
                _e( 'No themes match your request.' );
        }
 

-       function get_views() {
+       /**
+        *
+        * @global array $tabs
+        * @global string $tab
+        * @return array
+        */
+       protected function get_views() {

                global $tabs, $tab;
 
                $display_tabs = array();
                global $tabs, $tab;
 
                $display_tabs = array();


@@ -157,7 +171,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                return $display_tabs;
        }
 
                return $display_tabs;
        }
 

-       function display() {
+       /**
+        * @access public
+        */
+       public function display() {

                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
                <div class="tablenav top themes">
                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
                <div class="tablenav top themes">


@@ -180,10 +197,13 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                </div>
 
                <?php
                </div>
 
                <?php

-               parent::tablenav( 'bottom' );
+               $this->tablenav( 'bottom' );

        }
 
        }
 

-       function display_rows() {
+       /**
+        * @access public
+        */
+       public function display_rows() {

                $themes = $this->items;
                foreach ( $themes as $theme ) {
                                ?>
                $themes = $this->items;
                foreach ( $themes as $theme ) {
                                ?>


@@ -198,6 +218,8 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
        /**
         * Prints a theme from the WordPress.org API.
         *
        /**
         * Prints a theme from the WordPress.org API.
         *

+        * @global array $themes_allowedtags
+        *

         * @param object $theme An object that contains theme data returned by the WordPress.org API.
         *
         * Example theme data:
         * @param object $theme An object that contains theme data returned by the WordPress.org API.
         *
         * Example theme data:


@@ -214,7 +236,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
         *     public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
         *     public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip'
         */
         *     public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
         *     public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip'
         */

-       function single_row( $theme ) {
+       public function single_row( $theme ) {

                global $themes_allowedtags;
 
                if ( empty( $theme ) )
                global $themes_allowedtags;
 
                if ( empty( $theme ) )


@@ -244,10 +266,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                $status = $this->_get_theme_status( $theme );
 
                switch ( $status ) {
                $status = $this->_get_theme_status( $theme );
 
                switch ( $status ) {

-                       default:
-                       case 'install':
-                               $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
-                               break;

                        case 'update_available':
                                $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
                                break;
                        case 'update_available':
                                $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
                                break;


@@ -255,6 +273,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                        case 'latest_installed':
                                $actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
                                break;
                        case 'latest_installed':
                                $actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
                                break;

+                       case 'install':
+                       default:
+                               $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+                               break;

                }
 
                $actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
                }
 
                $actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';


@@ -272,7 +294,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
                ?>
                <a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
 
                ?>
                <a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">

-                       <img src='<?php echo esc_url( $theme->screenshot_url ); ?>' width='150' />
+                       <img src="<?php echo esc_url( $theme->screenshot_url ); ?>" width="150" />

                </a>
 
                <h3><?php echo $name; ?></h3>
                </a>
 
                <h3><?php echo $name; ?></h3>


@@ -294,7 +316,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
        /**
         * Prints the wrapper for the theme installer.
         */
        /**
         * Prints the wrapper for the theme installer.
         */

-       function theme_installer() {
+       public function theme_installer() {

                ?>
                <div id="theme-installer" class="wp-full-overlay expanded">
                        <div class="wp-full-overlay-sidebar">
                ?>
                <div id="theme-installer" class="wp-full-overlay expanded">
                        <div class="wp-full-overlay-sidebar">


@@ -306,10 +328,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                                        <div class="install-theme-info"></div>
                                </div>
                                <div class="wp-full-overlay-footer">
                                        <div class="install-theme-info"></div>
                                </div>
                                <div class="wp-full-overlay-footer">

-                                       <a href="#" class="collapse-sidebar" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
-                                               <span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
+                                       <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">

                                                <span class="collapse-sidebar-arrow"></span>
                                                <span class="collapse-sidebar-arrow"></span>

-                                       </a>
+                                               <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+                                       </button>

                                </div>
                        </div>
                        <div class="wp-full-overlay-main"></div>
                                </div>
                        </div>
                        <div class="wp-full-overlay-main"></div>


@@ -323,7 +345,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
         *
         * @param object $theme - A WordPress.org Theme API object.
         */
         *
         * @param object $theme - A WordPress.org Theme API object.
         */

-       function theme_installer_single( $theme ) {
+       public function theme_installer_single( $theme ) {

                ?>
                <div id="theme-installer" class="wp-full-overlay single-theme">
                        <div class="wp-full-overlay-sidebar">
                ?>
                <div id="theme-installer" class="wp-full-overlay single-theme">
                        <div class="wp-full-overlay-sidebar">


@@ -339,9 +361,11 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
        /**
         * Prints the info for a theme (to be used in the theme installer modal).
         *
        /**
         * Prints the info for a theme (to be used in the theme installer modal).
         *

+        * @global array $themes_allowedtags
+        *

         * @param object $theme - A WordPress.org Theme API object.
         */
         * @param object $theme - A WordPress.org Theme API object.
         */

-       function install_theme_info( $theme ) {
+       public function install_theme_info( $theme ) {

                global $themes_allowedtags;
 
                if ( empty( $theme ) )
                global $themes_allowedtags;
 
                if ( empty( $theme ) )


@@ -350,8 +374,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                $name   = wp_kses( $theme->name,   $themes_allowedtags );
                $author = wp_kses( $theme->author, $themes_allowedtags );
 
                $name   = wp_kses( $theme->name,   $themes_allowedtags );
                $author = wp_kses( $theme->author, $themes_allowedtags );
 

-               $num_ratings = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $theme->num_ratings ), number_format_i18n( $theme->num_ratings ) );
-

                $install_url = add_query_arg( array(
                        'action' => 'install-theme',
                        'theme'  => $theme->slug,
                $install_url = add_query_arg( array(
                        'action' => 'install-theme',
                        'theme'  => $theme->slug,


@@ -367,10 +389,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                ?>
                <div class="install-theme-info"><?php
                        switch ( $status ) {
                ?>
                <div class="install-theme-info"><?php
                        switch ( $status ) {

-                               default:
-                               case 'install':
-                                       echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
-                                       break;

                                case 'update_available':
                                        echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
                                        break;
                                case 'update_available':
                                        echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
                                        break;


@@ -378,6 +396,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                                case 'latest_installed':
                                        echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
                                        break;
                                case 'latest_installed':
                                        echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
                                        break;

+                               case 'install':
+                               default:
+                                       echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
+                                       break;

                        } ?>
                        <h3 class="theme-name"><?php echo $name; ?></h3>
                        <span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
                        } ?>
                        <h3 class="theme-name"><?php echo $name; ?></h3>
                        <span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>


@@ -403,12 +425,14 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
         * Send required variables to JavaScript land
         *
         * @since 3.4.0
         * Send required variables to JavaScript land
         *
         * @since 3.4.0

-        * @access private
+        * @access public
+        *
+        * @global string $tab  Current tab within Themes->Install screen
+        * @global string $type Type of search.

         *
         *

-        * @uses $tab Global; current tab within Themes->Install screen
-        * @uses $type Global; type of search.
+        * @param array $extra_args Unused.

         */
         */

-       function _js_vars( $extra_args = array() ) {
+       public function _js_vars( $extra_args = array() ) {

                global $tab, $type;
                parent::_js_vars( compact( 'tab', 'type' ) );
        }
                global $tab, $type;
                parent::_js_vars( compact( 'tab', 'type' ) );
        }