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

Add get_search_link() with Permastruct (/search/) support. Props jshreve. Update get_search_link(), get_search_feed_link() & get_search_comments_feed_link() to use it, as well as supporting Permastructs for those feeds. Fixes #10552 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-28 04:15:02 +00:00
parent b9c22a4e91
commit 549cebcf5c
1 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
wp-includes/link-template.php
View File

@ -655,6 +655,35 @@ function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
echo $before . apply_filters( 'edit_tag_link', $link, $tag->term_id ) . $after;
}
/**
* Retrieve permalink for search.
*
* @since 3.0.0
* @param string $query Optional. The query string to use. If empty the current query is used.
* @return string
*/
function get_search_link( $query = '' ) {
global $wp_rewrite;
if ( empty($query) )
$search = get_search_query();
else
$search = stripslashes($query);
$permastruct = $wp_rewrite->get_search_permastruct();
if ( empty( $permastruct ) ) {
$link = home_url('?s=' . urlencode($search) );
} else {
$search = urlencode($search);
$search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it unencoded.
$link = str_replace( '%search%', $search, $permastruct );
$link = home_url( user_trailingslashit( $link, 'search' ) );
}
return apply_filters( 'search_link', $link, $search );
}
/**
* Retrieve the permalink for the feed of the search results.
*
@ -665,17 +694,22 @@ function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
* @return string
*/
function get_search_feed_link($search_query = '', $feed = '') {
if ( empty($search_query) )
$search = esc_attr( urlencode(get_search_query()) );
else
$search = esc_attr( urlencode(stripslashes($search_query)) );
global $wp_rewrite;
$link = get_search_link($search_query);
if ( empty($feed) )
$feed = get_default_feed();
$link = home_url("?s=$search&feed=$feed");
$permastruct = $wp_rewrite->get_search_permastruct();
$link = apply_filters('search_feed_link', $link);
if ( empty($permastruct) ) {
$link = add_query_arg('feed', $feed, $link);
} else {
$link = trailingslashit($link);
$link .= "feed/$feed/";
}
$link = apply_filters('search_feed_link', $link, $feed, 'posts');
return $link;
}
@ -690,17 +724,21 @@ function get_search_feed_link($search_query = '', $feed = '') {
* @return string
*/
function get_search_comments_feed_link($search_query = '', $feed = '') {
if ( empty($search_query) )
$search = esc_attr( urlencode(get_search_query()) );
else
$search = esc_attr( urlencode(stripslashes($search_query)) );
global $wp_rewrite;
if ( empty($feed) )
$feed = get_default_feed();
$link = home_url("?s=$search&feed=comments-$feed");
$link = get_search_feed_link($search_query, $feed);
$link = apply_filters('search_feed_link', $link);
$permastruct = $wp_rewrite->get_search_permastruct();
if ( empty($permastruct) )
$link = add_query_arg('feed', 'comments-' . $feed, $link);
else
$link = add_query_arg('withcomments', 1, $link);
$link = apply_filters('search_feed_link', $link, $feed, 'comments');
return $link;
}