<!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>[26316] trunk/src/wp-admin: Themes: Move the escaping of content from JS back to PHP.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26316">26316</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-11-22 02:33:19 +0000 (Fri, 22 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Themes: Move the escaping of content from JS back to PHP. This allows us to take advantage of the display() WP_Theme method to translate the text properly, and to strip out any HTML tags we don't wish to display. Fixes <a href="http://core.trac.wordpress.org/ticket/26100">#26100</a>. See <a href="http://core.trac.wordpress.org/ticket/25948">#25948</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/theme.php (26315 => 26316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/theme.php 2013-11-22 02:22:15 UTC (rev 26315)
+++ trunk/src/wp-admin/includes/theme.php 2013-11-22 02:33:19 UTC (rev 26316)
</span><span class="lines">@@ -405,10 +405,9 @@
</span><span class="cx"> 'name' => $theme->display( 'Name' ),
</span><span class="cx"> 'screenshot' => array( $theme->get_screenshot() ), // @todo multiple
</span><span class="cx"> 'description' => $theme->display( 'Description' ),
</span><del>- 'author' => $theme->get( 'Author' ),
- 'authorURI' => $theme->get( 'AuthorURI' ),
- 'version' => $theme->get( 'Version' ),
- 'tags' => $theme->get( 'Tags' ),
</del><ins>+ 'author' => $theme->display( 'Author' ),
+ 'version' => $theme->display( 'Version' ),
+ 'tags' => $theme->display( 'Tags' ),
</ins><span class="cx"> 'parent' => $parent,
</span><span class="cx"> 'active' => $slug === $current_theme,
</span><span class="cx"> 'hasUpdate' => isset( $updates[ $slug ] ),
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/themes.php (26315 => 26316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/themes.php 2013-11-22 02:22:15 UTC (rev 26315)
+++ trunk/src/wp-admin/themes.php 2013-11-22 02:33:19 UTC (rev 26316)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> <div class="theme-screenshot">
</span><span class="cx"> <img src="{{ data.screenshot[0] }}" alt="" />
</span><span class="cx"> </div>
</span><del>- <div class="theme-author"><?php printf( __( 'By %s' ), '{{ data.author }}' ); ?></div>
</del><ins>+ <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
</ins><span class="cx"> <h3 class="theme-name">{{ data.name }}</h3>
</span><span class="cx"> <div class="theme-actions">
</span><span class="cx">
</span><span class="lines">@@ -266,12 +266,8 @@
</span><span class="cx"> <# if ( data.active ) { #>
</span><span class="cx"> <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
</span><span class="cx"> <# } #>
</span><del>- <h3 class="theme-name">{{ data.name }}<span class="theme-version"><?php _e('Version: '); ?> {{ data.version }}</span></h3>
- <# if ( data.authorURI ) { #>
- <h4 class="theme-author"><?php printf( __( 'By %s' ), '<a href="{{ data.authorURI }}">{{ data.author }}</a>' ); ?></h4>
- <# } else { #>
- <h4 class="theme-author"><?php printf( __( 'By %s' ), '{{ data.author }}' ); ?></h4>
- <# } #>
</del><ins>+ <h3 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{{ data.version }}}' ); ?></span></h3>
+ <h4 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></h4>
</ins><span class="cx">
</span><span class="cx"> <# if ( data.hasUpdate ) { #>
</span><span class="cx"> <div class="theme-update-message">
</span><span class="lines">@@ -282,13 +278,13 @@
</span><span class="cx"> <p class="theme-description">{{{ data.description }}}</p>
</span><span class="cx">
</span><span class="cx"> <# if ( data.parent ) { #>
</span><del>- <p class="parent-theme"><?php printf( __( 'This is a child theme of <strong>%s</strong>.' ), '{{ data.parent }}' ); ?></p>
</del><ins>+ <p class="parent-theme"><?php printf( __( 'This is a child theme of <strong>%s</strong>.' ), '{{{ data.parent }}}' ); ?></p>
</ins><span class="cx"> <# } #>
</span><span class="cx">
</span><del>- <# if ( data.tags.length !== 0 ) { #>
</del><ins>+ <# if ( data.tags ) { #>
</ins><span class="cx"> <p class="theme-tags">
</span><span class="cx"> <span><?php _e( 'Tags:' ); ?></span>
</span><del>- {{{ data.tags.join( ', ' ).replace( /-/g, ' ' ) }}}
</del><ins>+ {{{ data.tags.replace( /-/g, ' ' ) }}}
</ins><span class="cx"> </p>
</span><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>