Default Themes: Import Twenty Nineteen from the 5.0 branch.
Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.
Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.
Fixes #45424.
Built from https://develop.svn.wordpress.org/trunk@44149
git-svn-id: http://core.svn.wordpress.org/trunk@43979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-14 03:33:41 +01:00
|
|
|
<?php
|
|
|
|
/**
|
|
|
|
* Custom comment walker for this theme
|
|
|
|
*
|
|
|
|
* @package WordPress
|
|
|
|
* @subpackage Twenty_Nineteen
|
|
|
|
* @since 1.0.0
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This class outputs custom comment walker for HTML5 friendly WordPress comment and threaded replies.
|
|
|
|
*
|
|
|
|
* @since 1.0.0
|
|
|
|
*/
|
|
|
|
class TwentyNineteen_Walker_Comment extends Walker_Comment {
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Outputs a comment in the HTML5 format.
|
|
|
|
*
|
|
|
|
* @see wp_list_comments()
|
|
|
|
*
|
|
|
|
* @param WP_Comment $comment Comment to display.
|
|
|
|
* @param int $depth Depth of the current comment.
|
|
|
|
* @param array $args An array of arguments.
|
|
|
|
*/
|
|
|
|
protected function html5_comment( $comment, $depth, $args ) {
|
|
|
|
|
|
|
|
$tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
|
|
|
|
|
|
|
|
?>
|
|
|
|
<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
|
|
|
|
<article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
|
|
|
|
<footer class="comment-meta">
|
|
|
|
<div class="comment-author vcard">
|
|
|
|
<?php
|
2018-12-19 04:24:11 +01:00
|
|
|
$comment_author_link = get_comment_author_link( $comment );
|
|
|
|
$comment_author_url = get_comment_author_url( $comment );
|
|
|
|
$comment_author = get_comment_author( $comment );
|
|
|
|
$avatar = get_avatar( $comment, $args['avatar_size'] );
|
2018-12-14 04:25:40 +01:00
|
|
|
if ( 0 != $args['avatar_size'] ) {
|
|
|
|
if ( empty( $comment_author_url ) ) {
|
|
|
|
echo $avatar;
|
|
|
|
} else {
|
|
|
|
printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url );
|
|
|
|
echo $avatar;
|
Default Themes: Import Twenty Nineteen from the 5.0 branch.
Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.
Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.
Fixes #45424.
Built from https://develop.svn.wordpress.org/trunk@44149
git-svn-id: http://core.svn.wordpress.org/trunk@43979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-14 03:33:41 +01:00
|
|
|
}
|
2018-12-14 04:25:40 +01:00
|
|
|
}
|
2018-12-19 04:24:11 +01:00
|
|
|
/*
|
|
|
|
* Using the `check` icon instead of `check_circle`, since we can't add a
|
|
|
|
* fill color to the inner check shape when in circle form.
|
|
|
|
*/
|
|
|
|
if ( twentynineteen_is_comment_by_post_author( $comment ) ) {
|
|
|
|
printf( '<span class="post-author-badge" aria-hidden="true">%s</span>', twentynineteen_get_icon_svg( 'check', 24 ) );
|
|
|
|
}
|
Default Themes: Import Twenty Nineteen from the 5.0 branch.
Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.
Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.
Fixes #45424.
Built from https://develop.svn.wordpress.org/trunk@44149
git-svn-id: http://core.svn.wordpress.org/trunk@43979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-14 03:33:41 +01:00
|
|
|
|
2018-12-19 04:24:11 +01:00
|
|
|
/*
|
|
|
|
* Using the `check` icon instead of `check_circle`, since we can't add a
|
|
|
|
* fill color to the inner check shape when in circle form.
|
|
|
|
*/
|
2018-12-14 04:25:40 +01:00
|
|
|
if ( twentynineteen_is_comment_by_post_author( $comment ) ) {
|
|
|
|
printf( '<span class="post-author-badge" aria-hidden="true">%s</span>', twentynineteen_get_icon_svg( 'check', 24 ) );
|
|
|
|
}
|
Default Themes: Import Twenty Nineteen from the 5.0 branch.
Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.
Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.
Fixes #45424.
Built from https://develop.svn.wordpress.org/trunk@44149
git-svn-id: http://core.svn.wordpress.org/trunk@43979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-14 03:33:41 +01:00
|
|
|
|
2018-12-19 04:24:11 +01:00
|
|
|
printf(
|
|
|
|
/* translators: %s: comment author link */
|
|
|
|
wp_kses(
|
Default Themes: Import Twenty Nineteen from the 5.0 branch.
Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.
Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.
Fixes #45424.
Built from https://develop.svn.wordpress.org/trunk@44149
git-svn-id: http://core.svn.wordpress.org/trunk@43979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-14 03:33:41 +01:00
|
|
|
__( '%s <span class="screen-reader-text says">says:</span>', 'twentynineteen' ),
|
2018-12-19 04:24:11 +01:00
|
|
|
array(
|
|
|
|
'span' => array(
|
|
|
|
'class' => array(),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
),
|
|
|
|
'<b class="fn">' . get_comment_author_link( $comment ) . '</b>'
|
|
|
|
);
|
Default Themes: Import Twenty Nineteen from the 5.0 branch.
Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.
Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.
Fixes #45424.
Built from https://develop.svn.wordpress.org/trunk@44149
git-svn-id: http://core.svn.wordpress.org/trunk@43979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-14 03:33:41 +01:00
|
|
|
|
2018-12-14 04:25:40 +01:00
|
|
|
if ( ! empty( $comment_author_url ) ) {
|
|
|
|
echo '</a>';
|
|
|
|
}
|
Default Themes: Import Twenty Nineteen from the 5.0 branch.
Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.
Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.
Fixes #45424.
Built from https://develop.svn.wordpress.org/trunk@44149
git-svn-id: http://core.svn.wordpress.org/trunk@43979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-14 03:33:41 +01:00
|
|
|
?>
|
|
|
|
</div><!-- .comment-author -->
|
|
|
|
|
|
|
|
<div class="comment-metadata">
|
|
|
|
<a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
|
|
|
|
<?php
|
|
|
|
/* translators: 1: comment date, 2: comment time */
|
|
|
|
$comment_timestamp = sprintf( __( '%1$s at %2$s', 'twentynineteen' ), get_comment_date( '', $comment ), get_comment_time() );
|
|
|
|
?>
|
|
|
|
<time datetime="<?php comment_time( 'c' ); ?>" title="<?php echo $comment_timestamp; ?>">
|
|
|
|
<?php echo $comment_timestamp; ?>
|
|
|
|
</time>
|
|
|
|
</a>
|
|
|
|
<?php
|
|
|
|
$edit_comment_icon = twentynineteen_get_icon_svg( 'edit', 16 );
|
|
|
|
edit_comment_link( __( 'Edit', 'twentynineteen' ), '<span class="edit-link-sep">—</span> <span class="edit-link">' . $edit_comment_icon, '</span>' );
|
|
|
|
?>
|
|
|
|
</div><!-- .comment-metadata -->
|
|
|
|
|
|
|
|
<?php if ( '0' == $comment->comment_approved ) : ?>
|
|
|
|
<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentynineteen' ); ?></p>
|
|
|
|
<?php endif; ?>
|
|
|
|
</footer><!-- .comment-meta -->
|
|
|
|
|
|
|
|
<div class="comment-content">
|
|
|
|
<?php comment_text(); ?>
|
|
|
|
</div><!-- .comment-content -->
|
|
|
|
|
|
|
|
</article><!-- .comment-body -->
|
|
|
|
|
|
|
|
<?php
|
|
|
|
comment_reply_link(
|
|
|
|
array_merge(
|
|
|
|
$args,
|
|
|
|
array(
|
|
|
|
'add_below' => 'div-comment',
|
|
|
|
'depth' => $depth,
|
|
|
|
'max_depth' => $args['max_depth'],
|
|
|
|
'before' => '<div class="comment-reply">',
|
|
|
|
'after' => '</div>',
|
|
|
|
)
|
|
|
|
)
|
|
|
|
);
|
|
|
|
?>
|
|
|
|
<?php
|
|
|
|
}
|
|
|
|
}
|