Changeset 15264

Timestamp:

06/15/2010 08:31:44 PM (16 years ago)

Author:

nacin

Message:

Two birds with one stone. fixes #13902, props ocean90, wahgnube. fixes #13555, props hakre.

Location:

trunk

Files:

• wp-admin/import.php (modified) (2 diffs)
• wp-includes/post-template.php (modified) (1 diff)

trunk/wp-admin/import.php

@@ -104 +104 @@
                                         $keys = array_keys($plugins);
                                         $plugin_file = $plugin_slug . '/' . $keys[0];
-                                        $action = '<a href="' . wp_nonce_url(admin_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;from=import'), 'activate-plugin_' . $plugin_file) .
+                                        $action = '<a href="' . esc_url(wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $plugin_file . '&from=import'), 'activate-plugin_' . $plugin_file)) .
                                                                                         '"title="' . esc_attr__('Activate importer') . '"">' . $data[0] . '</a>';
                                 }
                         }
                         if ( empty($action) )
-                                $action = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin_slug .
-                                                                                '&amp;from=import&amp;TB_iframe=true&amp;width=600&amp;height=550') . '" class="thickbox" title="' .
+                                $action = '<a href="' . esc_url(admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
+                                                                                '&from=import&TB_iframe=true&width=600&height=550')) . '" class="thickbox" title="' .
                                                                                 esc_attr__('Install importer') . '">' . $data[0] . '</a>';
                 } else {
@@ -131 +131 @@
 
 if ( current_user_can('install_plugins') )
-        echo '<p>' . sprintf('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.', admin_url('plugin-install.php?tab=search&type=tag&s=importer') ) . '</p>';
+        echo '<p>' . sprintf('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.', esc_url(admin_url('plugin-install.php?tab=search&type=tag&s=importer')) ) . '</p>';
 ?>
 

trunk/wp-includes/post-template.php

@@ -136 +136 @@
  */
 function the_guid( $id = 0 ) {
-        echo esc_url( get_the_guid($id) );
+        echo esc_url( get_the_guid( $id ) );
 }