<!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>[23673] trunk/wp-content/themes/twentythirteen: Twenty Thirteen: remove searchform.php template once core search form accepts HTML5 argument.</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/23673">23673</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-03-12 17:44:27 +0000 (Tue, 12 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Thirteen: remove searchform.php template once core search form accepts HTML5 argument. Props obenland, fixes <a href="http://core.trac.wordpress.org/ticket/23701">#23701</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteen404php">trunk/wp-content/themes/twentythirteen/404.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteencommentsphp">trunk/wp-content/themes/twentythirteen/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteencontentnonephp">trunk/wp-content/themes/twentythirteen/content-none.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteencssiecss">trunk/wp-content/themes/twentythirteen/css/ie.css</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenheaderphp">trunk/wp-content/themes/twentythirteen/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenstylecss">trunk/wp-content/themes/twentythirteen/style.css</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteensearchformphp">trunk/wp-content/themes/twentythirteen/searchform.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentythirteen404php"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/404.php (23672 => 23673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/404.php        2013-03-12 17:27:24 UTC (rev 23672)
+++ trunk/wp-content/themes/twentythirteen/404.php        2013-03-12 17:44:27 UTC (rev 23673)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">                                         &lt;h2&gt;&lt;?php _e( 'This is somewhat embarrassing, isn&amp;rsquo;t it?', 'twentythirteen' ); ?&gt;&lt;/h2&gt;
</span><span class="cx">                                         &lt;p&gt;&lt;?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentythirteen' ); ?&gt;&lt;/p&gt;
</span><span class="cx"> 
</span><del>-                                        &lt;?php get_search_form(); ?&gt;
</del><ins>+                                        &lt;?php get_search_form( true, 'html5' ); ?&gt;
</ins><span class="cx">                                 &lt;/div&gt;&lt;!-- .page-content --&gt;
</span><span class="cx">                         &lt;/div&gt;&lt;!-- .page-wrapper --&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/comments.php (23672 => 23673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/comments.php        2013-03-12 17:27:24 UTC (rev 23672)
+++ trunk/wp-content/themes/twentythirteen/comments.php        2013-03-12 17:44:27 UTC (rev 23673)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">                         if ( get_comment_pages_count() &gt; 1 &amp;&amp; get_option( 'page_comments' ) ) :
</span><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;nav class=&quot;navigation comment-navigation&quot; role=&quot;navigation&quot;&gt;
</span><del>-                        &lt;h1 class=&quot;assistive-text section-heading&quot;&gt;&lt;?php _e( 'Comment navigation', 'twentythirteen' ); ?&gt;&lt;/h1&gt;
</del><ins>+                        &lt;h1 class=&quot;screen-reader-text section-heading&quot;&gt;&lt;?php _e( 'Comment navigation', 'twentythirteen' ); ?&gt;&lt;/h1&gt;
</ins><span class="cx">                         &lt;div class=&quot;nav-previous&quot;&gt;&lt;?php previous_comments_link( __( '&amp;larr; Older Comments', 'twentythirteen' ) ); ?&gt;&lt;/div&gt;
</span><span class="cx">                         &lt;div class=&quot;nav-next&quot;&gt;&lt;?php next_comments_link( __( 'Newer Comments &amp;rarr;', 'twentythirteen' ) ); ?&gt;&lt;/div&gt;
</span><span class="cx">                 &lt;/nav&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteencontentnonephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/content-none.php (23672 => 23673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/content-none.php        2013-03-12 17:27:24 UTC (rev 23672)
+++ trunk/wp-content/themes/twentythirteen/content-none.php        2013-03-12 17:44:27 UTC (rev 23673)
</span><span class="lines">@@ -20,12 +20,12 @@
</span><span class="cx">         &lt;?php elseif ( is_search() ) : ?&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;p&gt;&lt;?php _e( 'Sorry, but nothing matched your search terms. Please try again with different keywords.', 'twentythirteen' ); ?&gt;&lt;/p&gt;
</span><del>-        &lt;?php get_search_form(); ?&gt;
</del><ins>+        &lt;?php get_search_form( true, 'html5' ); ?&gt;
</ins><span class="cx"> 
</span><span class="cx">         &lt;?php else : ?&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;p&gt;&lt;?php _e( 'It seems we can&amp;rsquo;t find what you&amp;rsquo;re looking for. Perhaps searching can help.', 'twentythirteen' ); ?&gt;&lt;/p&gt;
</span><del>-        &lt;?php get_search_form(); ?&gt;
</del><ins>+        &lt;?php get_search_form( true, 'html5' ); ?&gt;
</ins><span class="cx"> 
</span><span class="cx">         &lt;?php endif; ?&gt;
</span><span class="cx"> &lt;/div&gt;&lt;!-- .page-content --&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteencssiecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/css/ie.css (23672 => 23673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/css/ie.css        2013-03-12 17:27:24 UTC (rev 23672)
+++ trunk/wp-content/themes/twentythirteen/css/ie.css        2013-03-12 17:44:27 UTC (rev 23673)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">         left: 100%;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.site-header .searchform .field {
</del><ins>+.site-header .searchform [type=&quot;search&quot;] {
</ins><span class="cx">         padding-top: 6px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -174,8 +174,7 @@
</span><span class="cx">         width: 13px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.ie7 .assistive-text,
-.ie7 .site .screen-reader-text {
</del><ins>+.ie7 .screen-reader-text {
</ins><span class="cx">         clip: rect(1px 1px 1px 1px); /* IE7 */
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -204,7 +203,7 @@
</span><span class="cx">         left: 100%;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.ie7 .site-header .searchform .field {
</del><ins>+.ie7 .site-header .searchform [type=&quot;search&quot;] {
</ins><span class="cx">         background-color: #fff;
</span><span class="cx">         border: 2px solid #c3c0ab;
</span><span class="cx">         cursor: text;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/functions.php (23672 => 23673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php        2013-03-12 17:27:24 UTC (rev 23672)
+++ trunk/wp-content/themes/twentythirteen/functions.php        2013-03-12 17:44:27 UTC (rev 23673)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">                 return;
</span><span class="cx">         ?&gt;
</span><span class="cx">         &lt;nav class=&quot;navigation paging-navigation&quot; role=&quot;navigation&quot;&gt;
</span><del>-                &lt;h1 class=&quot;assistive-text&quot;&gt;&lt;?php _e( 'Posts navigation', 'twentythirteen' ); ?&gt;&lt;/h1&gt;
</del><ins>+                &lt;h1 class=&quot;screen-reader-text&quot;&gt;&lt;?php _e( 'Posts navigation', 'twentythirteen' ); ?&gt;&lt;/h1&gt;
</ins><span class="cx">                 &lt;div class=&quot;nav-links&quot;&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php if ( get_next_posts_link() ) : ?&gt;
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx">                 return;
</span><span class="cx">         ?&gt;
</span><span class="cx">         &lt;nav class=&quot;navigation post-navigation&quot; role=&quot;navigation&quot;&gt;
</span><del>-                &lt;h1 class=&quot;assistive-text&quot;&gt;&lt;?php _e( 'Post navigation', 'twentythirteen' ); ?&gt;&lt;/h1&gt;
</del><ins>+                &lt;h1 class=&quot;screen-reader-text&quot;&gt;&lt;?php _e( 'Post navigation', 'twentythirteen' ); ?&gt;&lt;/h1&gt;
</ins><span class="cx">                 &lt;div class=&quot;nav-links&quot;&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php previous_post_link( '%link', _x( '&lt;span class=&quot;meta-nav&quot;&gt;&amp;larr;&lt;/span&gt; %title', 'Previous post link', 'twentythirteen' ) ); ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/header.php (23672 => 23673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/header.php        2013-03-12 17:27:24 UTC (rev 23672)
+++ trunk/wp-content/themes/twentythirteen/header.php        2013-03-12 17:44:27 UTC (rev 23673)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx">                         &lt;div id=&quot;navbar&quot; class=&quot;navbar&quot;&gt;
</span><span class="cx">                                 &lt;nav id=&quot;site-navigation&quot; class=&quot;navigation main-navigation&quot; role=&quot;navigation&quot;&gt;
</span><span class="cx">                                         &lt;h3 class=&quot;menu-toggle&quot;&gt;&lt;?php _e( 'Menu', 'twentythirteen' ); ?&gt;&lt;/h3&gt;
</span><del>-                                        &lt;a class=&quot;assistive-text skip-link&quot; href=&quot;#content&quot; title=&quot;&lt;?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?&gt;&quot;&gt;&lt;?php _e( 'Skip to content', 'twentythirteen' ); ?&gt;&lt;/a&gt;
</del><ins>+                                        &lt;a class=&quot;screen-reader-text skip-link&quot; href=&quot;#content&quot; title=&quot;&lt;?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?&gt;&quot;&gt;&lt;?php _e( 'Skip to content', 'twentythirteen' ); ?&gt;&lt;/a&gt;
</ins><span class="cx">                                         &lt;?php wp_nav_menu( array( 'theme_location' =&gt; 'primary', 'menu_class' =&gt; 'nav-menu' ) ); ?&gt;
</span><del>-                                        &lt;?php get_search_form(); ?&gt;
</del><ins>+                                        &lt;?php get_search_form( true, 'html5' ); ?&gt;
</ins><span class="cx">                                 &lt;/nav&gt;&lt;!-- #site-navigation --&gt;
</span><span class="cx">                         &lt;/div&gt;&lt;!-- #navbar --&gt;
</span><span class="cx">                 &lt;/header&gt;&lt;!-- #masthead --&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteensearchformphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-content/themes/twentythirteen/searchform.php (23672 => 23673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/searchform.php        2013-03-12 17:27:24 UTC (rev 23672)
+++ trunk/wp-content/themes/twentythirteen/searchform.php        2013-03-12 17:44:27 UTC (rev 23673)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-&lt;?php
-/**
- * The template for displaying search forms in Twenty Thirteen.
- *
- * @package WordPress
- * @subpackage Twenty_Thirteen
- * @since Twenty Thirteen 1.0
- */
-?&gt;
-&lt;form method=&quot;get&quot; id=&quot;searchform&quot; class=&quot;searchform&quot; action=&quot;&lt;?php echo esc_url( home_url( '/' ) ); ?&gt;&quot; role=&quot;search&quot;&gt;
-        &lt;label for=&quot;s&quot; class=&quot;assistive-text&quot;&gt;&lt;?php _ex( 'Search', 'assistive text', 'twentythirteen' ); ?&gt;&lt;/label&gt;
-        &lt;input type=&quot;search&quot; class=&quot;field&quot; name=&quot;s&quot; value=&quot;&lt;?php echo esc_attr( get_search_query() ); ?&gt;&quot; id=&quot;s&quot; placeholder=&quot;&lt;?php echo esc_attr_x( 'Search &amp;hellip;', 'placeholder', 'twentythirteen' ); ?&gt;&quot; /&gt;
-        &lt;input type=&quot;submit&quot; class=&quot;submit&quot; name=&quot;submit&quot; id=&quot;searchsubmit&quot; value=&quot;&lt;?php echo esc_attr_x( 'Search', 'submit button', 'twentythirteen' ); ?&gt;&quot; /&gt;
-&lt;/form&gt;
</del></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/style.css (23672 => 23673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/style.css        2013-03-12 17:27:24 UTC (rev 23672)
+++ trunk/wp-content/themes/twentythirteen/style.css        2013-03-12 17:44:27 UTC (rev 23673)
</span><span class="lines">@@ -537,14 +537,14 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* Assistive text */
</span><del>-.assistive-text {
</del><ins>+.screen-reader-text {
</ins><span class="cx">         position: absolute !important;
</span><span class="cx">         clip: rect(1px, 1px, 1px, 1px);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.assistive-text:hover,
-.assistive-text:active,
-.assistive-text:focus {
</del><ins>+.screen-reader-text:hover,
+.screen-reader-text:active,
+.screen-reader-text:focus {
</ins><span class="cx">         background-color: #f1f1f1;
</span><span class="cx">         border-radius: 3px;
</span><span class="cx">         box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
</span><span class="lines">@@ -926,13 +926,13 @@
</span><span class="cx">         width: 100%;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.main-navigation .searchform {
</del><ins>+.site-header .searchform {
</ins><span class="cx">         position: absolute;
</span><span class="cx">         right: 0;
</span><span class="cx">         top: 1px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.site-header .searchform .field {
</del><ins>+.site-header .searchform [type=&quot;search&quot;] {
</ins><span class="cx">         background-color: transparent;
</span><span class="cx">         background-image: url(images/search-icon.png);
</span><span class="cx">         background-position: 5px center;
</span><span class="lines">@@ -949,7 +949,7 @@
</span><span class="cx">         width: 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.site-header .searchform .field:focus {
</del><ins>+.site-header .searchform [type=&quot;search&quot;]:focus {
</ins><span class="cx">         background-color: #fff;
</span><span class="cx">         border: 2px solid #c3c0ab;
</span><span class="cx">         cursor: text;
</span><span class="lines">@@ -2549,11 +2549,11 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* Search widget */
</span><del>-.searchform .submit {
</del><ins>+.searchform [type=&quot;submit&quot;] {
</ins><span class="cx">         display: none;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.widget .searchform .field {
</del><ins>+.widget .searchform [type=&quot;text&quot;] {
</ins><span class="cx">         width: 100%;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -3162,7 +3162,7 @@
</span><span class="cx">         (-webkit-min-device-pixel-ratio: 1.25),
</span><span class="cx">         (min-resolution: 120dpi) {
</span><span class="cx"> 
</span><del>-        .site-header .searchform .field {
</del><ins>+        .site-header .searchform [type=&quot;search&quot;] {
</ins><span class="cx">                 background-image: url(images/search-icon-2x.png);
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -3182,8 +3182,8 @@
</span><span class="cx">                 font-size: 10pt;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        footer a[rel=bookmark]:link:after,
-        footer a[rel=bookmark]:visited:after {
</del><ins>+        footer a[rel=&quot;bookmark&quot;]:link:after,
+        footer a[rel=&quot;bookmark&quot;]:visited:after {
</ins><span class="cx">                 content: &quot; [&quot; attr(href) &quot;] &quot;; /* Show URLs */
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>