From 71e4bdc269dec4e6f5471debcac5e20f3b13dc49 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Wed, 23 Oct 2013 20:58:09 +0000
Subject: [PATCH] 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
---
 wp-includes/query.php   | 2 +-
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/query.php b/wp-includes/query.php
index b0fd38d1a1..a9300329d1 100644
--- a/wp-includes/query.php
+++ b/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/wp-includes/version.php b/wp-includes/version.php
index 784adc0157..c73b028502 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.