Ticket #11009: 11009.diff

wp-admin/includes/plugin-install.php

@@ -304 +304 @@
 function install_plugin_information() {
         global $tab;
 
-        $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) );
+        $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ) ) );
 
         if ( is_wp_error($api) )
                 wp_die($api);
@@ -327 +327 @@
                 'other_notes'  => _x('Other Notes',  'Plugin installer section title')
         );
 
+        $api->sections = (array) $api->sections;
+        if ( is_ssl() || true )
+                $api->sections['screenshots'] = $api->sections['screenshots_ssl'];
+        unset( $api->sections['screenshots_ssl'] );
+
         //Sanitize HTML
-        foreach ( (array)$api->sections as $section_name => $content )
+        foreach ( $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 ) )