<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23800] trunk/wp-includes/general-template.php: Rename 'get_search_form' action to 'pre_get_search_form' to prevent collision with the filter of the same name.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23800">23800</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-03-26 21:08:04 +0000 (Tue, 26 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/19321">#19321</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (23799 => 23800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2013-03-26 20:34:37 UTC (rev 23799)
+++ trunk/wp-includes/general-template.php 2013-03-26 21:08:04 UTC (rev 23800)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> * form into the sidebar and also by the search widget in WordPress.
</span><span class="cx"> *
</span><span class="cx"> * There is also an action that is called whenever the function is run called,
</span><del>- * 'get_search_form'. This can be useful for outputting JavaScript that the
</del><ins>+ * 'pre_get_search_form'. This can be useful for outputting JavaScript that the
</ins><span class="cx"> * search relies on or various formatting that applies to the beginning of the
</span><span class="cx"> * search. To give a few examples of what it can be used for.
</span><span class="cx"> *
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> * @return string|null String when retrieving, null when displaying or if searchform.php exists.
</span><span class="cx"> */
</span><span class="cx"> function get_search_form( $echo = true ) {
</span><del>- do_action( 'get_search_form' );
</del><ins>+ do_action( 'pre_get_search_form' );
</ins><span class="cx">
</span><span class="cx"> $format = apply_filters( 'search_form_format', 'xhtml' );
</span><span class="cx">
</span><span class="lines">@@ -175,10 +175,14 @@
</span><span class="cx"> </form>';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $result = apply_filters( 'get_search_form', $form );
+ if ( null === $result )
+ $result = $form;
+
</ins><span class="cx"> if ( $echo )
</span><del>- echo apply_filters( 'get_search_form', $form );
</del><ins>+ echo $result;
</ins><span class="cx"> else
</span><del>- return apply_filters( 'get_search_form', $form );
</del><ins>+ return $result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>