<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14331] trunk: Remove Twenty Ten's searchform.
php and use the core get_search_form() markup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14331">14331</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-02 18:10:42 +0000 (Sun, 02 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove Twenty Ten's searchform.php and use the core get_search_form() markup. fixes <a href="http://trac.wordpress.org/ticket/13053">#13053</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytensearchformphp">trunk/wp-content/themes/twentyten/searchform.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytensearchformphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-content/themes/twentyten/searchform.php (14330 => 14331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/searchform.php 2010-05-02 06:02:54 UTC (rev 14330)
+++ trunk/wp-content/themes/twentyten/searchform.php 2010-05-02 18:10:42 UTC (rev 14331)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-<?php
-/**
- * The Search Form
- *
- * Optional file that allows displaying a custom search form
- * when the get_search_form() template tag is used.
- *
- * @package WordPress
- * @subpackage Twenty Ten
- * @since 3.0.0
- */
-?>
-
- <form id="searchform" name="searchform" method="get" action="<?php echo home_url(); ?>">
- <div>
- <label for="s"><?php _e( 'Search', 'twentyten' ); ?></label>
- <input type="text" id="s" name="s" />
- <input type="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyten' ); ?>" />
- </div>
- </form>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (14330 => 14331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-05-02 06:02:54 UTC (rev 14330)
+++ trunk/wp-includes/general-template.php 2010-05-02 18:10:42 UTC (rev 14331)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $form = '<form role="search" method="get" id="searchform" action="' . home_url() . '/" >
</del><ins>+ $form = '<form role="search" method="get" id="searchform" action="' . home_url( '/' ) . '" >
</ins><span class="cx"> <div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
</span><span class="cx"> <input type="text" value="' . get_search_query() . '" name="s" id="s" />
</span><span class="cx"> <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
</span></span></pre>
</div>
</div>
</body>
</html>