WordPress.org

Make WordPress Core

Changeset 15264


Ignore:
Timestamp:
06/15/2010 08:31:44 PM (11 years ago)
Author:
nacin
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/import.php

    r15181 r15264  
    104104                    $keys = array_keys($plugins);
    105105                    $plugin_file = $plugin_slug . '/' . $keys[0];
    106                     $action = '<a href="' . wp_nonce_url(admin_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;from=import'), 'activate-plugin_' . $plugin_file) .
     106                    $action = '<a href="' . esc_url(wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $plugin_file . '&from=import'), 'activate-plugin_' . $plugin_file)) .
    107107                                            '"title="' . esc_attr__('Activate importer') . '"">' . $data[0] . '</a>';
    108108                }
    109109            }
    110110            if ( empty($action) )
    111                 $action = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin_slug .
    112                                         '&amp;from=import&amp;TB_iframe=true&amp;width=600&amp;height=550') . '" class="thickbox" title="' .
     111                $action = '<a href="' . esc_url(admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
     112                                        '&from=import&TB_iframe=true&width=600&height=550')) . '" class="thickbox" title="' .
    113113                                        esc_attr__('Install importer') . '">' . $data[0] . '</a>';
    114114        } else {
     
    131131
    132132if ( current_user_can('install_plugins') )
    133     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>';
     133    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>';
    134134?>
    135135
  • trunk/wp-includes/post-template.php

    r15116 r15264  
    136136 */
    137137function the_guid( $id = 0 ) {
    138     echo esc_url( get_the_guid($id) );
     138    echo esc_url( get_the_guid( $id ) );
    139139}
    140140
Note: See TracChangeset for help on using the changeset viewer.