<!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>[13031] trunk/wp-content/themes/twentyten/comments.php: Use comment_form().</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13031">13031</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-08 21:02:08 +0000 (Mon, 08 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use comment_form(). Props beaulebens. see <a href="http://trac.wordpress.org/ticket/9015">#9015</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytencommentsphp">trunk/wp-content/themes/twentyten/comments.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (13030 => 13031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php        2010-02-08 20:54:29 UTC (rev 13030)
+++ trunk/wp-content/themes/twentyten/comments.php        2010-02-08 21:02:08 UTC (rev 13031)
</span><span class="lines">@@ -49,66 +49,6 @@
</span><span class="cx"> &lt;?php endif; ?&gt;
</span><span class="cx"> &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><del>-&lt;?php if ( comments_open() ) : ?&gt;
</del><ins>+&lt;?php comment_form(); ?&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;div id=&quot;respond&quot;&gt;
-
-                                &lt;h3 id=&quot;reply-title&quot;&gt;&lt;?php comment_form_title( __('Leave a Reply', 'twentyten'), __('Leave a Reply to %s', 'twentyten') ); ?&gt; &lt;small&gt;&lt;?php cancel_comment_reply_link( __('Cancel reply', 'twentyten') ); ?&gt;&lt;/small&gt;&lt;/h3&gt;
-
-&lt;?php if ( get_option('comment_registration') &amp;&amp; !is_user_logged_in() ) : ?&gt;
-                                &lt;p&gt;&lt;?php printf( __('You must be &lt;a href=&quot;%s&quot;&gt;logged in&lt;/a&gt; to post a comment.', 'twentyten'), wp_login_url( get_permalink() ) ); ?&gt;&lt;/p&gt;
-
-&lt;?php else : // here's the big comment form ?&gt;
-                                &lt;form action=&quot;&lt;?php echo site_url('wp-comments-post.php'); ?&gt;&quot; method=&quot;post&quot; id=&quot;commentform&quot;&gt;
-
-        &lt;?php if ( $user_ID ) : ?&gt;
-                                        &lt;p id=&quot;login&quot;&gt;&lt;?php printf(__('&lt;span class=&quot;loggedin&quot;&gt;Logged in as &lt;a href=&quot;%1$s&quot; title=&quot;Logged in as %2$s&quot;&gt;%2$s&lt;/a&gt;.&lt;/span&gt; &lt;span class=&quot;logout&quot;&gt;&lt;a href=&quot;%3$s&quot; title=&quot;Log out of this account&quot;&gt;Log out?&lt;/a&gt;&lt;/span&gt;', 'twentyten'),
-                                                admin_url('profile.php'),
-                                                wp_specialchars($user_identity, true),
-                                                wp_logout_url(get_permalink()) ) ?&gt;&lt;/p&gt;
-
-        &lt;?php else : ?&gt;
-
-                                        &lt;p id=&quot;comment-notes&quot;&gt;&lt;?php _e('Your email is &lt;em&gt;never&lt;/em&gt; published nor shared.', 'twentyten') ?&gt; &lt;?php if ($req) _e('Required fields are marked &lt;span class=&quot;required&quot;&gt;*&lt;/span&gt;', 'twentyten') ?&gt;&lt;/p&gt;
-
-
-                                        &lt;div id=&quot;form-section-author&quot; class=&quot;form-section&quot;&gt;
-                                                &lt;div class=&quot;form-label&quot;&gt;&lt;label for=&quot;author&quot;&gt;&lt;?php _e('Name', 'twentyten') ?&gt;&lt;/label&gt; &lt;?php if ($req) _e('&lt;span class=&quot;required&quot;&gt;*&lt;/span&gt;', 'twentyten') ?&gt;&lt;/div&gt;
-                                                &lt;div class=&quot;form-input&quot;&gt;&lt;input id=&quot;author&quot; name=&quot;author&quot; type=&quot;text&quot; value=&quot;&lt;?php echo esc_attr($comment_author) ?&gt;&quot; size=&quot;30&quot; tabindex=&quot;3&quot; /&gt;&lt;/div&gt;
-                                        &lt;/div&gt;&lt;!-- #form-section-author .form-section --&gt;
-
-                                        &lt;div id=&quot;form-section-email&quot; class=&quot;form-section&quot;&gt;
-                                                &lt;div class=&quot;form-label&quot;&gt;&lt;label for=&quot;email&quot;&gt;&lt;?php _e('Email', 'twentyten') ?&gt;&lt;/label&gt; &lt;?php if ($req) _e('&lt;span class=&quot;required&quot;&gt;*&lt;/span&gt;', 'twentyten') ?&gt;&lt;/div&gt;
-                                                &lt;div class=&quot;form-input&quot;&gt;&lt;input id=&quot;email&quot; name=&quot;email&quot; type=&quot;text&quot; value=&quot;&lt;?php echo esc_attr($comment_author_email) ?&gt;&quot; size=&quot;30&quot; tabindex=&quot;4&quot; /&gt;&lt;/div&gt;
-                                        &lt;/div&gt;&lt;!-- #form-section-email .form-section --&gt;
-
-                                        &lt;div id=&quot;form-section-url&quot; class=&quot;form-section&quot;&gt;
-                                                &lt;div class=&quot;form-label&quot;&gt;&lt;label for=&quot;url&quot;&gt;&lt;?php _e('Website', 'twentyten') ?&gt;&lt;/label&gt;&lt;/div&gt;
-                                                &lt;div class=&quot;form-input&quot;&gt;&lt;input id=&quot;url&quot; name=&quot;url&quot; type=&quot;text&quot; value=&quot;&lt;?php echo esc_attr($comment_author_url) ?&gt;&quot; size=&quot;30&quot; tabindex=&quot;5&quot; /&gt;&lt;/div&gt;
-                                        &lt;/div&gt;&lt;!-- #form-section-url .form-section --&gt;
-
-        &lt;?php endif; // if ( $user_ID ) ?&gt;
-
-                                        &lt;div id=&quot;form-section-comment&quot; class=&quot;form-section&quot;&gt;
-                                                &lt;div class=&quot;form-label&quot;&gt;&lt;label for=&quot;comment&quot;&gt;&lt;?php _e('Comment', 'twentyten') ?&gt;&lt;/label&gt;&lt;/div&gt;
-                                                &lt;div class=&quot;form-textarea&quot;&gt;&lt;textarea id=&quot;comment&quot; name=&quot;comment&quot; cols=&quot;45&quot; rows=&quot;8&quot; tabindex=&quot;6&quot;&gt;&lt;/textarea&gt;&lt;/div&gt;
-                                        &lt;/div&gt;&lt;!-- #form-section-comment .form-section --&gt;
-
-                                        &lt;div id=&quot;form-allowed-tags&quot; class=&quot;form-section&quot;&gt;
-                                                &lt;p&gt;&lt;span&gt;&lt;?php _e('You may use these &lt;abbr title=&quot;HyperText Markup Language&quot;&gt;HTML&lt;/abbr&gt; tags and attributes:', 'twentyten') ?&gt;&lt;/span&gt; &lt;code&gt;&lt;?php echo allowed_tags(); ?&gt;&lt;/code&gt;&lt;/p&gt;
-                                        &lt;/div&gt;
-
-                                        &lt;?php do_action('comment_form', $post-&gt;ID); ?&gt;
-
-                                        &lt;div class=&quot;form-submit&quot;&gt;&lt;input id=&quot;submit&quot; name=&quot;submit&quot; type=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Post Comment', 'twentyten') ?&gt;&quot; tabindex=&quot;7&quot; /&gt;&lt;input type=&quot;hidden&quot; name=&quot;comment_post_ID&quot; value=&quot;&lt;?php echo esc_attr($id); ?&gt;&quot; /&gt;&lt;/div&gt;
-
-&lt;?php comment_id_fields(); ?&gt;
-
-
-                                &lt;/form&gt;
-
-        &lt;?php endif; // If registration required and not logged in ?&gt;
-                        &lt;/div&gt; &lt;!-- #respond --&gt;
-
-&lt;?php endif; // if you delete this the sky will fall on your head ?&gt;
-                        &lt;/div&gt;&lt;!-- #comments --&gt;
</del><ins>+&lt;/div&gt;&lt;!-- #comments --&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>