Changeset 25890

Timestamp:

10/23/2013 08:58:00 PM (12 years ago)

Author:

nacin

Message:

Avoid notice with search feeds.

Merges [25889] to the 3.7 branch.

fixes #25677.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/query.php (modified) (1 diff)
• src/wp-includes/version.php (modified) (1 diff)

branches/3.7/src/wp-includes/query.php

@@ -2630 +2630 @@
         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 );
 

branches/3.7/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.7-RC2-25888-src';
+$wp_version = '3.7-RC2-25890-src';
 
 /**