Changeset 23800 for trunk/wp-includes/general-template.php

Timestamp:

03/26/2013 09:08:04 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Rename 'get_search_form' action to 'pre_get_search_form' to prevent collision with the filter of the same name. Make sure the filtered result is not null to prevent search form from disappearing if an action function is attached to the old hook. fixes #19321.

File:

• trunk/wp-includes/general-template.php (modified) (3 diffs)

trunk/wp-includes/general-template.php

@@ -142 +142 @@
  *
  * There is also an action that is called whenever the function is run called,
- * 'get_search_form'. This can be useful for outputting JavaScript that the
+ * 'pre_get_search_form'. This can be useful for outputting JavaScript that the
  * search relies on or various formatting that applies to the beginning of the
  * search. To give a few examples of what it can be used for.
@@ -154 +154 @@
  */
 function get_search_form( $echo = true ) {
-    do_action( 'get_search_form' );
+    do_action( 'pre_get_search_form' );
 
     $format = apply_filters( 'search_form_format', 'xhtml' );
@@ -176 +176 @@
     }
 
+    $result = apply_filters( 'get_search_form', $form );
+    if ( null === $result )
+        $result = $form;
+
     if ( $echo )
-        echo apply_filters( 'get_search_form', $form );
+        echo $result;
     else
-        return apply_filters( 'get_search_form', $form );
+        return $result;
 }