<!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>[23696] trunk/wp-content/themes/twentythirteen: Twenty Thirteen: remove custom comment callback in favor of core `comment_form()` defaults.</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/23696">23696</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-03-14 16:36:14 +0000 (Thu, 14 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Thirteen: remove custom comment callback in favor of core `comment_form()` defaults. Props obenland, closes <a href="http://core.trac.wordpress.org/ticket/22005">#22005</a>. See <a href="http://core.trac.wordpress.org/ticket/20088">#20088</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteencommentsphp">trunk/wp-content/themes/twentythirteen/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenrtlcss">trunk/wp-content/themes/twentythirteen/rtl.css</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenstylecss">trunk/wp-content/themes/twentythirteen/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentythirteencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/comments.php (23695 => 23696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/comments.php 2013-03-14 04:58:39 UTC (rev 23695)
+++ trunk/wp-content/themes/twentythirteen/comments.php 2013-03-14 16:36:14 UTC (rev 23696)
</span><span class="lines">@@ -30,7 +30,14 @@
</span><span class="cx"> </h2>
</span><span class="cx">
</span><span class="cx"> <ol class="comment-list">
</span><del>- <?php wp_list_comments( array( 'callback' => 'twentythirteen_comment', 'style' => 'ol' ) ); ?>
</del><ins>+ <?php
+ wp_list_comments( array(
+ 'style' => 'ol',
+ 'format' => 'html5',
+ 'short_ping' => true,
+ 'avatar_size' => 74,
+ ) );
+ ?>
</ins><span class="cx"> </ol><!-- .comment-list -->
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/functions.php (23695 => 23696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php 2013-03-14 04:58:39 UTC (rev 23695)
+++ trunk/wp-content/themes/twentythirteen/functions.php 2013-03-14 16:36:14 UTC (rev 23696)
</span><span class="lines">@@ -351,74 +351,6 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-if ( ! function_exists( 'twentythirteen_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * To override this walker in a child theme without modifying the comments
- * template simply create your own twentythirteen_comment(), and that function
- * will be used instead.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since Twenty Thirteen 1.0
- *
- * @param object $comment Comment to display.
- * @param array $args Optional args.
- * @param int $depth Depth of comment.
- * @return void
- */
-
-function twentythirteen_comment( $comment, $args, $depth ) {
- $GLOBALS['comment'] = $comment;
- switch ( $comment->comment_type ) :
- case 'pingback' :
- case 'trackback' :
- // Display trackbacks differently than normal comments.
- ?>
- <li id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
- <p><?php _e( 'Pingback:', 'twentythirteen' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( 'Edit', 'twentythirteen' ), '<span class="ping-meta"><span class="edit-link">', '</span></span>' ); ?></p>
- <?php
- break;
- default :
- // Proceed with normal comments.
- ?>
- <li id="li-comment-<?php comment_ID(); ?>">
- <article id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
- <div class="comment-author vcard">
- <?php echo get_avatar( $comment, 74 ); ?>
- <cite class="fn"><?php comment_author_link(); ?></cite>
- </div><!-- .comment-author -->
-
- <header class="comment-meta">
- <?php
- printf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
- esc_url( get_comment_link( $comment->comment_ID ) ),
- get_comment_time( 'c' ),
- sprintf( _x( '%1$s at %2$s', '1: date, 2: time', 'twentythirteen' ), get_comment_date(), get_comment_time() )
- );
- edit_comment_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
- ?>
- </header><!-- .comment-meta -->
-
- <?php if ( '0' == $comment->comment_approved ) : ?>
- <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentythirteen' ); ?></p>
- <?php endif; ?>
-
- <div class="comment-content">
- <?php comment_text(); ?>
- </div><!-- .comment-content -->
-
- <div class="reply">
- <?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'twentythirteen' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
- </div><!-- .reply -->
- </article><!-- #comment-## -->
- <?php
- break;
- endswitch; // End comment_type check.
-}
-endif;
-
</del><span class="cx"> if ( ! function_exists( 'twentythirteen_entry_meta' ) ) :
</span><span class="cx"> /**
</span><span class="cx"> * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/rtl.css (23695 => 23696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/rtl.css 2013-03-14 04:58:39 UTC (rev 23695)
+++ trunk/wp-content/themes/twentythirteen/rtl.css 2013-03-14 16:36:14 UTC (rev 23696)
</span><span class="lines">@@ -591,9 +591,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .comment-author {
</span><del>- float: right;
</del><span class="cx"> margin-left: 50px;
</span><span class="cx"> margin-right: auto;
</span><ins>+ left: auto;
+ right: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/style.css (23695 => 23696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/style.css 2013-03-14 04:58:39 UTC (rev 23695)
+++ trunk/wp-content/themes/twentythirteen/style.css 2013-03-14 16:36:14 UTC (rev 23696)
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx"> .navigation:after,
</span><span class="cx"> .nav-links:after,
</span><span class="cx"> .gallery:after,
</span><del>-.comment:after {
</del><ins>+.comment-body:after {
</ins><span class="cx"> clear: both;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -530,8 +530,8 @@
</span><span class="cx"> .nav-links:after,
</span><span class="cx"> .gallery:before,
</span><span class="cx"> .gallery:after,
</span><del>-.comment:before,
-.comment:after {
</del><ins>+.comment-body:before,
+.comment-body:after {
</ins><span class="cx"> content: "";
</span><span class="cx"> display: table;
</span><span class="cx"> }
</span><span class="lines">@@ -2258,14 +2258,15 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.comment {
</del><ins>+.comment-body {
</ins><span class="cx"> padding: 24px 0;
</span><ins>+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .comment-author {
</span><del>- float: left;
- margin-right: 50px;
</del><span class="cx"> max-width: 74px;
</span><ins>+ position: absolute;
+ left: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .comment-author .avatar {
</span><span class="lines">@@ -2274,16 +2275,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .comment-author .fn,
</span><ins>+.comment-author .url,
</ins><span class="cx"> .comment-reply-link {
</span><span class="cx"> color: #ed331c;
</span><span class="cx"> font-size: 14px;
</span><span class="cx"> font-style: normal;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.says {
+ display: none;
+}
+
</ins><span class="cx"> .no-avatars .comment-author {
</span><del>- float: none;
</del><span class="cx"> margin: 0 0 5px;
</span><span class="cx"> max-width: 100%;
</span><ins>+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .no-avatars .comment-meta,
</span><span class="lines">@@ -2329,6 +2335,7 @@
</span><span class="cx">
</span><span class="cx"> .comment-awaiting-moderation {
</span><span class="cx"> color: #a2a2a2;
</span><ins>+ margin: 20px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .comment-awaiting-moderation:before {
</span><span class="lines">@@ -2349,8 +2356,8 @@
</span><span class="cx"> padding: 30px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.comment + #respond {
- margin-bottom: 30px;
</del><ins>+.comment #respond {
+ margin-bottom: 20px;
</ins><span class="cx"> padding: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3117,9 +3124,9 @@
</span><span class="cx">
</span><span class="cx"> /* Comments */
</span><span class="cx"> .comment-author {
</span><del>- float: none;
</del><span class="cx"> margin: 0 0 5px;
</span><span class="cx"> max-width: 100%;
</span><ins>+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .comment-author .avatar {
</span></span></pre>
</div>
</div>
</body>
</html>