From bd14eca3abbb41f49cd1a7e7fce99cdbe11fd1d7 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 23 Oct 2013 20:58:00 +0000 Subject: [PATCH] Avoid notice with search feeds. Merges [25889] to the 3.7 branch. fixes #25677. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@25890 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/query.php | 2 +- src/wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/query.php b/src/wp-includes/query.php index b0fd38d1a1..a9300329d1 100644 --- a/src/wp-includes/query.php +++ b/src/wp-includes/query.php @@ -2629,7 +2629,7 @@ class WP_Query { // Order search results by relevance only when another "orderby" is not specified in the query. if ( ! empty( $q['s'] ) ) { $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 ); /** diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php index 77f3f70fe1..5c87c0c230 100644 --- a/src/wp-includes/version.php +++ b/src/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '3.7-RC2-25888-src'; +$wp_version = '3.7-RC2-25890-src'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.