WordPress.org

Make WordPress Core

Changeset 13978


Ignore:
Timestamp:
04/03/2010 11:38:38 PM (9 years ago)
Author:
nacin
Message:

Have get_search_query() escape by default, like it's echoing counterpart the_search_query(). see #12780

Location:
trunk
Files:
5 edited

Legend:

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

    r13957 r13978  
    168168<h2><?php echo esc_html( $title ); ?> <a href="<?php echo $post_new_file ?>" class="button add-new-h2"><?php echo esc_html_x('Add New', 'post'); ?></a> <?php
    169169if ( isset($_GET['s']) && $_GET['s'] )
    170     printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
     170    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
    171171</h2>
    172172
  • trunk/wp-admin/upload.php

    r13770 r13978  
    169169<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> <?php
    170170if ( isset($_GET['s']) && $_GET['s'] )
    171     printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
     171    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
    172172</h2>
    173173
  • trunk/wp-includes/feed-atom-comments.php

    r13113 r13978  
    1919            printf(ent2ncr(__('Comments on %s')), get_the_title_rss());
    2020        elseif ( is_search() )
    21             printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), esc_attr(get_search_query()));
     21            printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), get_search_query() );
    2222        else
    2323            printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
     
    3232    <id><?php echo get_post_comments_feed_link('', 'atom'); ?></id>
    3333<?php } elseif(is_search()) { ?>
    34     <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo home_url() . '?s=' . esc_attr(get_search_query()); ?>" />
     34    <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />
    3535    <link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link('', 'atom'); ?>" />
    3636    <id><?php echo get_search_comments_feed_link('', 'atom'); ?></id>
  • trunk/wp-includes/general-template.php

    r13831 r13978  
    157157    $form = '<form role="search" method="get" id="searchform" action="' . home_url() . '/" >
    158158    <div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
    159     <input type="text" value="' . esc_attr(apply_filters('the_search_query', get_search_query())) . '" name="s" id="s" />
     159    <input type="text" value="' . get_search_query() . '" name="s" id="s" />
    160160    <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
    161161    </div>
     
    16431643        $href = get_author_feed_link( $author_id );
    16441644    } elseif ( is_search() ) {
    1645         $title = esc_attr(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query() ));
     1645        $title = esc_attr(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) ));
    16461646        $href = get_search_feed_link();
    16471647    }
     
    18261826 * Retrieve the contents of the search WordPress query variable.
    18271827 *
    1828  * @since 2.3.0
    1829  *
    1830  * @return string
    1831  */
    1832 function get_search_query() {
    1833     return apply_filters( 'get_search_query', get_query_var( 's' ) );
    1834 }
    1835 
    1836 /**
    1837  * Display the contents of the search query variable.
    1838  *
    18391828 * The search query string is passed through {@link esc_attr()}
    18401829 * to ensure that it is safe for placing in an html attribute.
    18411830 *
    1842  * @uses attr
     1831 * @since 2.3.0
     1832 * @uses esc_attr()
     1833 *
     1834 * @param bool $escaped Whether the result is escaped. Default true.
     1835 *  Only use when you are later escaping it. Do not use unescaped.
     1836 * @return string
     1837 */
     1838function get_search_query( $escaped = true ) {
     1839    $query = apply_filters( 'get_search_query', get_query_var( 's' ) );
     1840    if ( $escaped )
     1841        $query = esc_attr( $query );
     1842    return $query;
     1843}
     1844
     1845/**
     1846 * Display the contents of the search query variable.
     1847 *
     1848 * The search query string is passed through {@link esc_attr()}
     1849 * to ensure that it is safe for placing in an html attribute.
     1850 *
     1851 * @uses esc_attr()
    18431852 * @since 2.1.0
    18441853 */
    18451854function the_search_query() {
    1846     echo esc_attr( apply_filters( 'the_search_query', get_search_query() ) );
     1855    echo esc_attr( apply_filters( 'the_search_query', get_search_query( false ) ) );
    18471856}
    18481857
  • trunk/wp-includes/link-template.php

    r13922 r13978  
    687687
    688688    if ( empty($query) )
    689         $search = get_search_query();
     689        $search = get_search_query( false );
    690690    else
    691691        $search = stripslashes($query);
Note: See TracChangeset for help on using the changeset viewer.