<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13483] trunk/wp-includes/link-template.php: Add get_search_link()
with Permastruct (/search/) support.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13483">13483</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-28 04:15:02 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.wordpress.org/ticket/10552">#10552</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (13482 => 13483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-02-28 03:18:40 UTC (rev 13482)
+++ trunk/wp-includes/link-template.php 2010-02-28 04:15:02 UTC (rev 13483)
</span><span class="lines">@@ -656,6 +656,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+* 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 );
+}
+
+/**
</ins><span class="cx"> * Retrieve the permalink for the feed of the search results.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><span class="lines">@@ -665,18 +694,23 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_search_feed_link($search_query = '', $feed = '') {
</span><del>- if ( empty($search_query) )
- $search = esc_attr( urlencode(get_search_query()) );
- else
- $search = esc_attr( urlencode(stripslashes($search_query)) );
</del><ins>+ global $wp_rewrite;
+ $link = get_search_link($search_query);
</ins><span class="cx">
</span><span class="cx"> if ( empty($feed) )
</span><span class="cx"> $feed = get_default_feed();
</span><span class="cx">
</span><del>- $link = home_url("?s=$search&amp;feed=$feed");
</del><ins>+ $permastruct = $wp_rewrite->get_search_permastruct();
</ins><span class="cx">
</span><del>- $link = apply_filters('search_feed_link', $link);
</del><ins>+ if ( empty($permastruct) ) {
+ $link = add_query_arg('feed', $feed, $link);
+ } else {
+ $link = trailingslashit($link);
+ $link .= "feed/$feed/";
+ }
</ins><span class="cx">
</span><ins>+ $link = apply_filters('search_feed_link', $link, $feed, 'posts');
+
</ins><span class="cx"> return $link;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -690,18 +724,22 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_search_comments_feed_link($search_query = '', $feed = '') {
</span><del>- if ( empty($search_query) )
- $search = esc_attr( urlencode(get_search_query()) );
- else
- $search = esc_attr( urlencode(stripslashes($search_query)) );
</del><ins>+ global $wp_rewrite;
</ins><span class="cx">
</span><span class="cx"> if ( empty($feed) )
</span><span class="cx"> $feed = get_default_feed();
</span><span class="cx">
</span><del>- $link = home_url("?s=$search&amp;feed=comments-$feed");
</del><ins>+ $link = get_search_feed_link($search_query, $feed);
</ins><span class="cx">
</span><del>- $link = apply_filters('search_feed_link', $link);
</del><ins>+ $permastruct = $wp_rewrite->get_search_permastruct();
</ins><span class="cx">
</span><ins>+ 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');
+
</ins><span class="cx"> return $link;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>