Changeset 23666

Timestamp:

03/12/2013 09:51:56 AM (14 years ago)

Author:

SergeyBiryukov

Message:

Always respect $echo argument in get_search_form(). props garyc40, kawauso. fixes #16541.

File:

• trunk/wp-includes/general-template.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -155 +155 @@
         $search_form_template = locate_template('searchform.php');
         if ( '' != $search_form_template ) {
+                ob_start();
                 require($search_form_template);
-                return;
-        }
-
-        $form = '<form role="search" method="get" id="searchform" action="' . esc_url( home_url( '/' ) ) . '" >
-        <div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
-        <input type="text" value="' . get_search_query() . '" name="s" id="s" />
-        <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
-        </div>
-        </form>';
+                $form = ob_get_clean();
+        } else {
+                $form = '<form role="search" method="get" id="searchform" action="' . esc_url( home_url( '/' ) ) . '" >
+                <div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
+                <input type="text" value="' . get_search_query() . '" name="s" id="s" />
+                <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
+                </div>
+                </form>';
+        }
 
         if ( $echo )