Changeset 13483 for trunk/wp-includes/link-template.php

Timestamp:

02/28/2010 04:15:02 AM (15 years ago)

Author:

dd32

Message:

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

File:

• trunk/wp-includes/link-template.php (modified) (3 diffs)

trunk/wp-includes/link-template.php

@@ -657 +657 @@
 
 /**
+* 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.
  *
@@ -666 +695 @@
  */
 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");
-
-    $link = apply_filters('search_feed_link', $link);
+    $permastruct = $wp_rewrite->get_search_permastruct();
+
+    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;
@@ -691 +725 @@
  */
 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 = apply_filters('search_feed_link', $link);
+    $link = get_search_feed_link($search_query, $feed);
+
+    $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;