Wordpress 3.6

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

diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 63a5f711f2bae08ddea250cf1f588f757d9c16c3..1c07b6856c10b609ee959c4104d6a14799949368 100644 (file)
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -81,7 +81,7 @@ function install_popular_tags( $args = array() ) {
 
 function install_dashboard() {
        ?>
-       <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%s">this page</a>.' ), self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
+       <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.' ), 'http://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
 
        <h4><?php _e('Search') ?></h4>
        <?php install_search_form( false ); ?>
@@ -116,8 +116,8 @@ add_action('install_plugins_dashboard', 'install_dashboard');
  * @since 2.7.0
  */
 function install_search_form( $type_selector = true ) {
-       $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : 'term';
-       $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
+       $type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term';
+       $term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : '';
 
        ?><form id="search-plugins" method="get" action="">
                <input type="hidden" name="tab" value="search" />
@@ -160,7 +160,7 @@ add_action('install_plugins_upload', 'install_plugins_upload', 10, 1);
  *
  */
 function install_plugins_favorites_form() {
-       $user = ! empty( $_GET['user'] ) ? stripslashes( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+       $user = ! empty( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
        ?>
        <p class="install-help"><?php _e( 'If you have marked plugins as favorites on WordPress.org, you can browse them here.' ); ?></p>
        <form method="get" action="">
@@ -229,7 +229,8 @@ function install_plugin_install_status($api, $loop = false) {
                                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_shift( $key = array_keys($installed_plugin) ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
+                               $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'], '=') ){
                                        $status = 'latest_installed';
                                } elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
@@ -251,7 +252,7 @@ function install_plugin_install_status($api, $loop = false) {
                }
        }
        if ( isset($_GET['from']) )
-               $url .= '&amp;from=' . urlencode(stripslashes($_GET['from']));
+               $url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
 
        return compact('status', 'url', 'version');
 }
@@ -264,7 +265,7 @@ function install_plugin_install_status($api, $loop = false) {
 function install_plugin_information() {
        global $tab;
 
-       $api = plugins_api('plugin_information', array('slug' => stripslashes( $_REQUEST['plugin'] ) ));
+       $api = plugins_api('plugin_information', array('slug' => wp_unslash( $_REQUEST['plugin'] ) ));
 
        if ( is_wp_error($api) )
                wp_die($api);
@@ -295,7 +296,7 @@ function install_plugin_information() {
                        $api->$key = wp_kses( $api->$key, $plugins_allowedtags );
        }
 
-       $section = isset($_REQUEST['section']) ? stripslashes( $_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 = array_shift( $section_titles = array_keys((array)$api->sections) );
 
@@ -358,7 +359,7 @@ function install_plugin_information() {
 <?php endif; if ( ! empty($api->downloaded) ) : ?>
                        <li><strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
 <?php endif; if ( ! empty($api->slug) && empty($api->external) ) : ?>
-                       <li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
+                       <li><a target="_blank" href="http://wordpress.org/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
 <?php endif; if ( ! empty($api->homepage) ) : ?>
                        <li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage &#187;') ?></a></li>
 <?php endif; ?>
@@ -386,7 +387,7 @@ function install_plugin_information() {
                        else
                                $title = ucwords( str_replace( '_', ' ', $section_name ) );
 
-                       $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
+                       $content = links_add_base_url($content, 'http://wordpress.org/plugins/' . $api->slug . '/');
                        $content = links_add_target($content, '_blank');
 
                        $san_section = esc_attr( $section_name );