Index: src/wp-admin/css/common.css =================================================================== --- src/wp-admin/css/common.css (revision 29045) +++ src/wp-admin/css/common.css (working copy) @@ -1833,13 +1833,6 @@ background-size: 100% auto; } -@media only screen and (max-width: 800px) { - #plugin-information-title.with-banner { - height: 100px; - bottom: 100px; - } -} - #plugin-information-title h2 { font-family: "Helvetica Neue", sans-serif; padding:0; @@ -1866,14 +1859,6 @@ border-radius: 8px; } -@media only screen and (max-width: 800px) { - #plugin-information-title.with-banner h2 { - top: 12px; - font-size: 20px; - line-height: 40px; - } -} - #plugin-information-title div.vignette { display: none; } @@ -1889,14 +1874,6 @@ box-shadow: inset 0 0 50px 4px rgba( 0, 0, 0, 0.2 ), inset 0 -1px 0 rgba( 0, 0, 0, 0.1 ); } -@media only screen and (max-width: 800px) { - #plugin-information-title.with-banner div.vignette { - height: 65px; - bottom: 65px; - width: 800%; - } -} - #plugin-information-tabs { padding: 0 16px; position: absolute; @@ -1912,12 +1889,6 @@ background: rgba( 255, 255, 255, 0.85 ); } -@media only screen and (max-width: 800px) { - #plugin-information-tabs.with-banner { - top: 65px; - } -} - #plugin-information-tabs a { position: relative; float: left; @@ -1959,12 +1930,6 @@ top:249px; } -@media only screen and (max-width: 800px) { - #plugin-information-content.with-banner { - top:99px; - } -} - #section-holder { margin: 0; padding: 10px 26px; @@ -2116,7 +2081,32 @@ font-size: 13px; } -@media screen and ( max-width: 782px ) { +@media screen and ( max-width: 771px ) { + #plugin-information-title.with-banner { + height: 100px; + bottom: 100px; + } + + #plugin-information-title.with-banner h2 { + top: 12px; + font-size: 20px; + line-height: 40px; + } + + #plugin-information-title.with-banner div.vignette { + height: 65px; + bottom: 65px; + width: 800%; + } + + #plugin-information-tabs.with-banner { + top: 65px; + } + + #plugin-information-content.with-banner { + top:99px; + } + #plugin-information-content { overflow: auto; bottom: 58px; Index: src/wp-admin/includes/plugin-install.php =================================================================== --- src/wp-admin/includes/plugin-install.php (revision 29045) +++ src/wp-admin/includes/plugin-install.php (working copy) @@ -26,13 +26,15 @@ * @param array|object $args Optional. Arguments to serialize for the Plugin Info API. * @return object plugins_api response object on success, WP_Error on failure. */ -function plugins_api($action, $args = null) { +function plugins_api( $action, $args = null ) { - if ( is_array($args) ) - $args = (object)$args; + if ( is_array( $args ) ) { + $args = (object) $args; + } - if ( !isset($args->per_page) ) + if ( ! isset( $args->per_page ) ) { $args->per_page = 24; + } /** * Override the Plugin Install API arguments. @@ -78,14 +80,14 @@ $request = wp_remote_post( $http_url, $args ); } - if ( is_wp_error($request) ) { - $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); + if ( is_wp_error( $request ) ) { + $res = new WP_Error( 'plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); } else { $res = maybe_unserialize( wp_remote_retrieve_body( $request ) ); if ( ! is_object( $res ) && ! is_array( $res ) ) - $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); + $res = new WP_Error( 'plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); } - } elseif ( !is_wp_error($res) ) { + } elseif ( ! is_wp_error( $res ) ) { $res->external = true; } @@ -110,13 +112,13 @@ * @return array */ function install_popular_tags( $args = array() ) { - $key = md5(serialize($args)); - if ( false !== ($tags = get_site_transient('poptags_' . $key) ) ) + $key = md5( serialize( $args ) ); + if ( false !== ( $tags = get_site_transient( 'poptags_' . $key ) ) ) return $tags; - $tags = plugins_api('hot_tags', $args); + $tags = plugins_api( 'hot_tags', $args ); - if ( is_wp_error($tags) ) + if ( is_wp_error( $tags ) ) return $tags; set_site_transient( 'poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS ); @@ -128,32 +130,34 @@ ?>

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

-

+

-

-

+

+

'; - if ( is_wp_error($api_tags) ) { + if ( is_wp_error( $api_tags ) ) { echo $api_tags->get_error_message(); } else { //Set up the tags in a way which can be interpreted by wp_generate_tag_cloud() $tags = array(); - foreach ( (array)$api_tags as $tag ) + foreach ( (array) $api_tags as $tag ) { $tags[ $tag['name'] ] = (object) array( - 'link' => esc_url( self_admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ), - 'name' => $tag['name'], - 'id' => sanitize_title_with_dashes($tag['name']), - 'count' => $tag['count'] ); - echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) ); + 'link' => esc_url( self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) ) ), + 'name' => $tag['name'], + 'id' => sanitize_title_with_dashes( $tag['name'] ), + 'count' => $tag['count'] + ); + } + echo wp_generate_tag_cloud( $tags, array( 'single_text' => __( '%s plugin' ), 'multiple_text' => __( '%s plugins' ) ) ); } echo '


'; } -add_action('install_plugins_dashboard', 'install_dashboard'); +add_action( 'install_plugins_dashboard', 'install_dashboard' ); /** * Display search form for searching plugins. @@ -161,22 +165,24 @@ * @since 2.7.0 */ function install_search_form( $type_selector = true ) { - $type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term'; - $term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : ''; + $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term'; + $term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : ''; - ?>
+ ?> + - + - - - + + + -
+ -

-

-
- - +

+

+ + +
display(); } @@ -244,63 +251,66 @@ * * @since 3.0.0 */ -function install_plugin_install_status($api, $loop = false) { - // this function is called recursively, $loop prevents further loops. - if ( is_array($api) ) +function install_plugin_install_status( $api, $loop = false ) { + // This function is called recursively, $loop prevents further loops. + if ( is_array( $api ) ) { $api = (object) $api; + } - //Default to a "new" plugin + // Default to a "new" plugin $status = 'install'; $url = false; - //Check to see if this plugin is known to be installed, and has an update awaiting it. - $update_plugins = get_site_transient('update_plugins'); + // Check to see if this plugin is known to be installed, and has an update awaiting it. + $update_plugins = get_site_transient( 'update_plugins' ); if ( isset( $update_plugins->response ) ) { - foreach ( (array)$update_plugins->response as $file => $plugin ) { + foreach ( (array) $update_plugins->response as $file => $plugin ) { if ( $plugin->slug === $api->slug ) { $status = 'update_available'; $update_file = $file; $version = $plugin->new_version; - if ( current_user_can('update_plugins') ) - $url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file); + if ( current_user_can( 'update_plugins' ) ) { + $url = wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' . $update_file ), 'upgrade-plugin_' . $update_file ); + } break; } } } - if ( 'install' == $status ) { + if ( 'install' === $status ) { if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) { - $installed_plugin = get_plugins('/' . $api->slug); - if ( empty($installed_plugin) ) { - if ( current_user_can('install_plugins') ) - $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug); + $installed_plugin = get_plugins( '/' . $api->slug ); + if ( empty( $installed_plugin ) ) { + if ( current_user_can( 'install_plugins' ) ) + $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $api->slug ), 'install-plugin_' . $api->slug ); } else { $key = array_keys( $installed_plugin ); - $key = array_shift( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers - if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){ + $key = array_shift( $key ); // Use the first plugin regardless of the name. Could have issues for multiple-plugins in one directory if they share different version numbers. + if ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '=' ) ) { $status = 'latest_installed'; - } elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) { + } elseif ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '<' ) ) { $status = 'newer_installed'; $version = $installed_plugin[ $key ]['Version']; } else { - //If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh + // If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh. if ( ! $loop ) { - delete_site_transient('update_plugins'); + delete_site_transient( 'update_plugins' ); wp_update_plugins(); - return install_plugin_install_status($api, true); + return install_plugin_install_status( $api, true ); } } } } else { - // "install" & no directory with that slug - if ( current_user_can('install_plugins') ) - $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug); + // "install" and no directory with that slug. + if ( current_user_can( 'install_plugins' ) ) { + $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $api->slug ), 'install-plugin_' . $api->slug ); + } } } - if ( isset($_GET['from']) ) + if ( isset( $_GET['from'] ) ) $url .= '&from=' . urlencode( wp_unslash( $_GET['from'] ) ); - return compact('status', 'url', 'version'); + return compact( 'status', 'url', 'version' ); } /** @@ -311,10 +321,15 @@ function install_plugin_information() { global $tab; - $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl(), 'fields' => array( 'banners' => true, 'reviews' => true ) ) ); + $api = plugins_api( 'plugin_information', array( + 'slug' => wp_unslash( $_REQUEST['plugin'] ), + 'is_ssl' => is_ssl(), + 'fields' => array( 'banners' => true, 'reviews' => true ) + ) ); - if ( is_wp_error( $api ) ) + if ( is_wp_error( $api ) ) { wp_die( $api ); + } $plugins_allowedtags = array( 'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ), @@ -326,49 +341,50 @@ ); $plugins_section_titles = array( - 'description' => _x('Description', 'Plugin installer section title'), - 'installation' => _x('Installation', 'Plugin installer section title'), - 'faq' => _x('FAQ', 'Plugin installer section title'), - 'screenshots' => _x('Screenshots', 'Plugin installer section title'), - 'changelog' => _x('Changelog', 'Plugin installer section title'), - 'reviews' => _x('Reviews', 'Plugin installer section title'), - 'other_notes' => _x('Other Notes', 'Plugin installer section title') + 'description' => _x( 'Description', 'Plugin installer section title' ), + 'installation' => _x( 'Installation', 'Plugin installer section title' ), + 'faq' => _x( 'FAQ', 'Plugin installer section title' ), + 'screenshots' => _x( 'Screenshots', 'Plugin installer section title' ), + 'changelog' => _x( 'Changelog', 'Plugin installer section title' ), + 'reviews' => _x( 'Reviews', 'Plugin installer section title' ), + 'other_notes' => _x( 'Other Notes', 'Plugin installer section title' ) ); - //Sanitize HTML - foreach ( (array)$api->sections as $section_name => $content ) { - $api->sections[$section_name] = wp_kses($content, $plugins_allowedtags); + // Sanitize HTML + foreach ( (array) $api->sections as $section_name => $content ) { + $api->sections[$section_name] = wp_kses( $content, $plugins_allowedtags ); } foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) { - if ( isset( $api->$key ) ) + if ( isset( $api->$key ) ) { $api->$key = wp_kses( $api->$key, $plugins_allowedtags ); + } } $_tab = esc_attr( $tab ); - $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English. + $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; // Default to the Description tab, Do not translate, API returns English. if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) { $section_titles = array_keys( (array) $api->sections ); $section = array_shift( $section_titles ); } - iframe_header( __('Plugin Install') ); + iframe_header( __( 'Plugin Install' ) ); $_with_banner = ''; - if ( !empty( $api->banners ) && ( !empty( $api->banners['low'] ) || !empty( $api->banners['high'] ) ) ) { + if ( ! empty( $api->banners ) && ( ! empty( $api->banners['low'] ) || ! empty( $api->banners['high'] ) ) ) { $_with_banner = 'with-banner'; - $low = ( !empty( $api->banners['low'] ) ) ? $api->banners['low'] : $api->banners['high']; - $high = ( !empty( $api->banners['high'] ) ) ? $api->banners['high'] : $api->banners['low']; + $low = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low']; + $high = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high']; ?> @@ -378,16 +394,18 @@ echo "

{$api->name}

"; echo "
\n"; - foreach ( (array)$api->sections as $section_name => $content ) { - if ( 'reviews' == $section_name && ( empty( $api->ratings ) || 0 == array_sum( (array) $api->ratings ) ) ) + foreach ( (array) $api->sections as $section_name => $content ) { + if ( 'reviews' === $section_name && ( empty( $api->ratings ) || 0 === array_sum( (array) $api->ratings ) ) ) { continue; + } - if ( isset( $plugins_section_titles[ $section_name ] ) ) + if ( isset( $plugins_section_titles[ $section_name ] ) ) { $title = $plugins_section_titles[ $section_name ]; - else + } else { $title = ucwords( str_replace( '_', ' ', $section_name ) ); + } - $class = ( $section_name == $section ) ? ' class="current"' : ''; + $class = ( $section_name === $section ) ? ' class="current"' : ''; $href = add_query_arg( array('tab' => $tab, 'section' => $section_name) ); $href = esc_url( $href ); $san_section = esc_attr( $section_name ); @@ -400,89 +418,92 @@
    -version ) ) : ?> -
  • version ?>
    • -author ) ) : ?> -
  • author, '_blank') ?>
    • -last_updated ) ) : ?> -
  • last_updated)) ) ?>
    • -requires ) ) : ?> -
  • requires) ?>
    • -tested ) ) : ?> -
  • tested ?>
    • -downloaded ) ) : ?> -
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • -slug ) && empty( $api->external ) ) : ?> -
    • -homepage ) ) : ?> -
    • -donate_link ) && empty( $api->contributors ) ) : ?> -
    • - + version ) ) { ?> +
  • version; ?>
    • + author ) ) { ?> +
  • author, '_blank' ); ?>
    • + last_updated ) ) { ?> +
  • + last_updated ) ) ); ?> +
    • + requires ) ) { ?> +
  • requires ); ?>
    • + tested ) ) { ?> +
  • tested; ?>
    • + downloaded ) ) { ?> +
  • downloaded ), number_format_i18n( $api->downloaded ) ); ?>
    • + slug ) && empty( $api->external ) ) { ?> +
    • + homepage ) ) { ?> +
    • + donate_link ) && empty( $api->contributors ) ) { ?> +
    • +
- rating ) ) : ?> -

+ rating ) ) { ?> +

$api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?> - num_ratings), number_format_i18n($api->num_ratings) ); ?> - - num_ratings ), number_format_i18n( $api->num_ratings ) ); ?> + ratings ) && array_sum( (array) $api->ratings ) > 0 ) { - foreach( $api->ratings as $key=>$ratecount ) { + foreach( $api->ratings as $key => $ratecount ) { // avoid div-by-zero $_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0; ?>
- stars - - + title=""> + stars + + - +
- contributors ) ) : ?> -

+ if ( ! empty( $api->contributors ) ) { ?> +

    contributors as $contrib_username => $contrib_profile ) { - if ( empty( $contrib_username ) && empty( $contrib_profile ) ) + if ( empty( $contrib_username ) && empty( $contrib_profile ) ) { continue; - if ( empty( $contrib_username ) ) + } + if ( empty( $contrib_username ) ) { $contrib_username = preg_replace( '/^.+\/(.+)\/?$/', '\1', $contrib_profile ); + } $contrib_username = sanitize_user( $contrib_username ); - if ( empty( $contrib_profile ) ) + if ( empty( $contrib_profile ) ) { echo "
  • {$contrib_username}
    • "; - else + } else { echo "
  • {$contrib_username}
    • "; + } } ?>
- donate_link ) ) : ?> - - - + donate_link ) ) { ?> + + +
tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) + if ( ! empty( $api->tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) { echo '

' . __('Warning: This plugin has not been tested with your current version of WordPress.') . '

'; - - else if ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) + } else if ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) { echo '

' . __('Warning: This plugin has not been marked as compatible with your version of WordPress.') . '

'; + } - foreach ( (array)$api->sections as $section_name => $content ) { - + foreach ( (array) $api->sections as $section_name => $content ) { $content = links_add_base_url( $content, 'https://wordpress.org/plugins/' . $api->slug . '/' ); $content = links_add_target( $content, '_blank' ); $san_section = esc_attr( $section_name ); - $display = ( $section_name == $section ) ? 'block' : 'none'; + $display = ( $section_name === $section ) ? 'block' : 'none'; echo "\t
\n"; echo $content; @@ -491,22 +512,24 @@ echo "
\n"; echo "
\n"; echo "