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

Avoid notice with search feeds. 

Merges [25889] to the 3.7 branch.

fixes #25677.

Built from https://develop.svn.wordpress.org/branches/3.7@25890


git-svn-id: http://core.svn.wordpress.org/branches/3.7@25802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-23 20:58:09 +00:00
parent 6ec5238145
commit 71e4bdc269
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/query.php
View File

@ -2629,7 +2629,7 @@ class WP_Query {
// Order search results by relevance only when another "orderby" is not specified in the query. // Order search results by relevance only when another "orderby" is not specified in the query.
if ( ! empty( $q['s'] ) ) { if ( ! empty( $q['s'] ) ) {
$search_orderby = ''; $search_orderby = '';
if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || 'relevance' === $q['orderby'] ) if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
$search_orderby = $this->parse_search_order( $q ); $search_orderby = $this->parse_search_order( $q );
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '3.7-RC2-25888'; $wp_version = '3.7-RC2-25890';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.