<!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>[30926] branches/4.1: Twenty Fifteen: Remove various unnecessary `esc_html()` calls and replace various unnecessary `esc_html_x()` calls with `_x()`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30926">30926</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30926","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-16 20:51:10 +0000 (Tue, 16 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Fifteen: Remove various unnecessary `esc_html()` calls and replace various unnecessary `esc_html_x()` calls with `_x()`.
Merges <a href="https://core.trac.wordpress.org/changeset/30899">[30899]</a>, <a href="https://core.trac.wordpress.org/changeset/30901">[30901]</a>, and <a href="https://core.trac.wordpress.org/changeset/30905">[30905]</a> into 4.1.
Props ocean90
Fixes <a href="https://core.trac.wordpress.org/ticket/30724">#30724</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches41srcwpcontentthemestwentyfifteeninctemplatetagsphp">branches/4.1/src/wp-content/themes/twentyfifteen/inc/template-tags.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches41">branches/4.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.1
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.1 2014-12-16 20:33:08 UTC (rev 30925)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.1 2014-12-16 20:51:10 UTC (rev 30926)
</ins><a id="branches41"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,30801-30813,30817,30821,30823-30824,30829-30832,30835,30837,30839-30844,30846-30847,30849,30852,30854,30856-30857,30860,30865-30867,30871-30874,30879,30884,30887-30891,30896-30897,30900,30903,30921
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,30801-30813,30817,30821,30823-30824,30829-30832,30835,30837,30839-30844,30846-30847,30849,30852,30854,30856-30857,30860,30865-30867,30871-30874,30879,30884,30887-30891,30896-30897,30899-30901,30903,30905,30921
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches41srcwpcontentthemestwentyfifteeninctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2014-12-16 20:33:08 UTC (rev 30925)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2014-12-16 20:51:10 UTC (rev 30926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $format = get_post_format();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'post-formats', $format ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( '<span class="screen-reader-text">%s </span>', esc_html_x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_post_format_link( $format ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_post_format_string( $format )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,13 +67,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time_string = sprintf( $time_string,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_date( 'c' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html( get_the_date() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_the_date(),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_modified_date( 'c' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html( get_the_modified_date() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_the_modified_date()
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_permalink() ),
</span><span class="cx" style="display: block; padding: 0 10px"> $time_string
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,16 +82,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post' == get_post_type() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() || is_multi_author() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html( get_the_author() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_the_author()
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $categories_list && twentyfifteen_categorized_blog() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $categories_list
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tags_list ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $tags_list
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = wp_get_attachment_metadata();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s × %4$s</a></span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_get_attachment_url() ),
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata['width'],
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata['height']
</span></span></pre>
</div>
</div>
</body>
</html>