<!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" />
<title>[3240] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer: developer.wordpress.org: Add `inc/search.php` to house search-related functionality and move such functionality out of `functions.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3240">3240</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3240","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-24 22:30:27 +0000 (Tue, 24 May 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>developer.wordpress.org: Add `inc/search.php` to house search-related functionality and move such functionality out of `functions.php`.
Props keesiemeijer.
See <a href="http://meta.trac.wordpress.org/ticket/1671">#1671</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincsearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php 2016-05-24 21:12:54 UTC (rev 3239)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php 2016-05-24 22:30:27 UTC (rev 3240)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,6 +76,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require __DIR__ . '/inc/autocomplete.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Search query.
+ */
+require __DIR__ . '/inc/search.php';
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Set the content width based on the theme's design and stylesheet.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $content_width ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,8 +102,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'post_type_link', __NAMESPACE__ . '\\method_permalink', 9, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'term_link', __NAMESPACE__ . '\\taxonomy_permalink', 10, 3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'posts_orderby', __NAMESPACE__ . '\\search_posts_orderby', 10, 2 );
- add_filter( 'the_posts', __NAMESPACE__ . '\\rerun_empty_exact_search', 10, 2 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'automatic-feed-links' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-thumbnails' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function pre_get_posts( $query ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $query->is_main_query() && ( $query->is_post_type_archive() || $query->is_search() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $query->is_main_query() && $query->is_post_type_archive() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'orderby', 'title' );
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'order', 'ASC' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,132 +204,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'wp-parser-source-file', str_replace( array( '.php', '/' ), array( '-php', '_' ), $query->query['wp-parser-source-file'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $query->is_search() ) {
-
- // If user has '()' at end of a search string, assume they want a specific function/method.
- $s = htmlentities( $query->get( 's' ) );
- if ( '()' === substr( $s, -2 ) ) {
- // Enable exact search
- $query->set( 'exact', true );
- // Modify the search query to omit the parentheses
- $query->set( 's', substr( $s, 0, -2 ) ); // remove '()'
- // Restrict search to function-like content
- $query->set( 'post_type', array( 'wp-parser-function', 'wp-parser-method' ) );
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // For search query modifications see DevHub_Search.
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Filter the SQL for the ORDER BY clause for search queries.
- *
- * Adds ORDER BY condition with spaces replaced with underscores in 'post_title'.
- * Adds ORDER BY condition to order by title length.
- *
- * @param string $orderby The ORDER BY clause of the query.
- * @param WP_Query $query The WP_Query instance (passed by reference).
- * @return string Filtered order by clause
- */
-function search_posts_orderby( $orderby, $query ) {
- global $wpdb;
-
- if ( $query->is_main_query() && is_search() && ! $query->get( 'exact' ) ) {
-
- $search_order_by_title = $query->get( 'search_orderby_title' );
-
- // Check if search_orderby_title is set by WP_Query::parse_search.
- if ( is_array( $search_order_by_title ) && $search_order_by_title ) {
-
- // Get search orderby query.
- $orderby = parse_search_order( $query->query_vars );
-
- // Add order by title length.
- $orderby .= " , CHAR_LENGTH( $wpdb->posts.post_title ) ASC, $wpdb->posts.post_title ASC";
- }
- }
-
- return $orderby;
-}
-
-/**
- * Generate SQL for the ORDER BY condition based on passed search terms.
- *
- * Similar to WP_Query::parse_search_order.
- * Adds ORDER BY condition with spaces replaced with underscores in 'post_title'.
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param array $q Query variables.
- * @return string ORDER BY clause.
- */
-function parse_search_order( $q ) {
- global $wpdb;
-
- if ( $q['search_terms_count'] > 1 ) {
- $num_terms = count( $q['search_orderby_title'] );
-
- // If the search terms contain negative queries, don't bother ordering by sentence matches.
- $like = $_like = '';
- if ( ! preg_match( '/(?:\s|^)\-/', $q['s'] ) ) {
- $like = '%' . $wpdb->esc_like( $q['s'] ) . '%';
- }
-
- $search_orderby = '';
-
- // Sentence match in 'post_title'.
- if ( $like ) {
- $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_title LIKE %s THEN 1 ", $like );
- $_like = str_replace( '-', '_', sanitize_title_with_dashes( $q['s'] ) );
- $_like = '%' . $wpdb->esc_like( $_like ) . '%';
- if ( $_like !== $like ) {
- // Sentence match in 'post_title' with spaces replaced with underscores.
- $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_title LIKE %s THEN 2 ", $_like );
- }
- }
-
- // Sanity limit, sort as sentence when more than 6 terms.
- // (few searches are longer than 6 terms and most titles are not)
- if ( $num_terms < 7 ) {
- // all words in title
- $search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 3 ';
- // any word in title, not needed when $num_terms == 1
- if ( $num_terms > 1 )
- $search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 4 ';
- }
-
- // Sentence match in 'post_content'.
- if ( $like ) {
- $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_content LIKE %s THEN 5 ", $like );
- }
-
- if ( $search_orderby ) {
- $search_orderby = '(CASE ' . $search_orderby . 'ELSE 6 END)';
- }
- } else {
- // Single word or sentence search.
- $search_orderby = reset( $q['search_orderby_title'] ) . ' DESC';
- }
-
- return $search_orderby;
-}
-
-/**
- * Rerun an exact search with the same criteria except exactness if no posts
- * were found.
- *
- * @access public
- *
- * @param array $posts Array of posts after the main query
- * @param WP_Query $query WP_Query object
- * @return array
- */
-function rerun_empty_exact_search( $posts, $query ) {
- if ( is_search() && true === $query->get( 'exact' ) && ! $query->found_posts ) {
- $query->set( 'exact', false );
- $posts = $query->get_posts();
- }
- return $posts;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> function register_nav_menus() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> \register_nav_menus( array(
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincsearchphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php 2016-05-24 22:30:27 UTC (rev 3240)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,170 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Search query customization.
+ *
+ * @package wporg-developer
+ */
+
+/**
+ * Class to handle search query customizations.
+ */
+class DevHub_Search {
+
+ /**
+ * Initializer
+ */
+ public static function init() {
+ add_action( 'init', array( __CLASS__, 'do_init' ) );
+ }
+
+ /**
+ * Handles adding/removing hooks.
+ */
+ public static function do_init() {
+ add_action( 'pre_get_posts', array( __CLASS__, 'pre_get_posts' ), 20 );
+ add_filter( 'posts_orderby', array( __CLASS__, 'search_posts_orderby' ), 10, 2 );
+ add_filter( 'the_posts', array( __CLASS__, 'rerun_empty_exact_search' ), 10, 2 );
+ }
+
+ /**
+ * Query modifications.
+ *
+ * @param \WP_Query $query
+ */
+ public static function pre_get_posts( $query ) {
+ // Don't modify anything if not a non-admin main search query.
+ if ( ! ( ! is_admin() && $query->is_main_query() && $query->is_search() ) ) {
+ return;
+ }
+
+ // Order search result in ascending order by title.
+ $query->set( 'orderby', 'title' );
+ $query->set( 'order', 'ASC' );
+
+ // If user has '()' at end of a search string, assume they want a specific function/method.
+ $s = htmlentities( $query->get( 's' ) );
+ if ( '()' === substr( $s, -2 ) ) {
+ // Enable exact search.
+ $query->set( 'exact', true );
+ // Modify the search query to omit the parentheses.
+ $query->set( 's', substr( $s, 0, -2 ) ); // remove '()'
+ // Restrict search to function-like content.
+ $query->set( 'post_type', array( 'wp-parser-function', 'wp-parser-method' ) );
+ }
+ }
+
+ /**
+ * Filter the SQL for the ORDER BY clause for search queries.
+ *
+ * Adds ORDER BY condition with spaces replaced with underscores in 'post_title'.
+ * Adds ORDER BY condition to order by title length.
+ *
+ * @param string $orderby The ORDER BY clause of the query.
+ * @param WP_Query $query The WP_Query instance (passed by reference).
+ * @return string Filtered order by clause
+ */
+ public static function search_posts_orderby( $orderby, $query ) {
+ global $wpdb;
+
+ if ( $query->is_main_query() && is_search() && ! $query->get( 'exact' ) ) {
+
+ $search_order_by_title = $query->get( 'search_orderby_title' );
+
+ // Check if search_orderby_title is set by WP_Query::parse_search.
+ if ( is_array( $search_order_by_title ) && $search_order_by_title ) {
+
+ // Get search orderby query.
+ $orderby = self::parse_search_order( $query->query_vars );
+
+ // Add order by title length.
+ $orderby .= " , CHAR_LENGTH( $wpdb->posts.post_title ) ASC, $wpdb->posts.post_title ASC";
+ }
+ }
+
+ return $orderby;
+ }
+
+ /**
+ * Generate SQL for the ORDER BY condition based on passed search terms.
+ *
+ * Similar to WP_Query::parse_search_order.
+ * Adds ORDER BY condition with spaces replaced with underscores in 'post_title'.
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $q Query variables.
+ * @return string ORDER BY clause.
+ */
+ public static function parse_search_order( $q ) {
+ global $wpdb;
+
+ if ( $q['search_terms_count'] > 1 ) {
+ $num_terms = count( $q['search_orderby_title'] );
+
+ // If the search terms contain negative queries, don't bother ordering by sentence matches.
+ $like = $_like = '';
+ if ( ! preg_match( '/(?:\s|^)\-/', $q['s'] ) ) {
+ $like = '%' . $wpdb->esc_like( $q['s'] ) . '%';
+ }
+
+ $search_orderby = '';
+
+ // Sentence match in 'post_title'.
+ if ( $like ) {
+ $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_title LIKE %s THEN 1 ", $like );
+ $_like = str_replace( '-', '_', sanitize_title_with_dashes( $q['s'] ) );
+ $_like = '%' . $wpdb->esc_like( $_like ) . '%';
+ if ( $_like !== $like ) {
+ // Sentence match in 'post_title' with spaces replaced with underscores.
+ $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_title LIKE %s THEN 2 ", $_like );
+ }
+ }
+
+ // Sanity limit, sort as sentence when more than 6 terms.
+ // (few searches are longer than 6 terms and most titles are not)
+ if ( $num_terms < 7 ) {
+ // all words in title
+ $search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 3 ';
+ // any word in title, not needed when $num_terms == 1
+ if ( $num_terms > 1 )
+ $search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 4 ';
+ }
+
+ // Sentence match in 'post_content'.
+ if ( $like ) {
+ $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_content LIKE %s THEN 5 ", $like );
+ }
+
+ if ( $search_orderby ) {
+ $search_orderby = '(CASE ' . $search_orderby . 'ELSE 6 END)';
+ }
+ } else {
+ // Single word or sentence search.
+ $search_orderby = reset( $q['search_orderby_title'] ) . ' DESC';
+ }
+
+ return $search_orderby;
+ }
+
+ /**
+ * Rerun an exact search with the same criteria except exactness if no posts
+ * were found.
+ *
+ * @access public
+ *
+ * @param array $posts Array of posts after the main query
+ * @param WP_Query $query WP_Query object
+ * @return array
+ */
+ public static function rerun_empty_exact_search( $posts, $query ) {
+ if ( is_search() && true === $query->get( 'exact' ) && ! $query->found_posts ) {
+ $query->set( 'exact', false );
+ $posts = $query->get_posts();
+ }
+
+ return $posts;
+ }
+
+} // DevHub_Search
+
+DevHub_Search::init();
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>