Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@15264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-06-15 20:31:44 +00:00
parent e3d5fb602b
commit d22bec05b6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/import.php
View File

@ -103,13 +103,13 @@ if (empty ($importers)) {
if ( !empty($plugins) ) {
$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 {
$action = "<a href='" . esc_url("admin.php?import=$id") . "' title='" . esc_attr( wptexturize(strip_tags($data[1])) ) ."'>{$data[0]}</a>";
@ -130,7 +130,7 @@ if (empty ($importers)) {
}
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>';
?>
</div>

2
wp-includes/post-template.php
View File

@ -135,7 +135,7 @@ function get_the_title( $id = 0 ) {
* @param int $id Optional. Post ID.
*/
function the_guid( $id = 0 ) {
echo esc_url( get_the_guid($id) );
echo esc_url( get_the_guid( $id ) );
}
/**