<!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>[27868] trunk/src/wp-includes/media-template.php: Favor escaping over interpolation in Underscore templates for media.</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/27868">27868</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-31 05:12:29 +0000 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Favor escaping over interpolation in Underscore templates for media. Translate some strings directly instead of passing via JS.
Props nacin.
See <a href="http://core.trac.wordpress.org/ticket/27574">#27574</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27867 => 27868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-30 22:19:30 UTC (rev 27867)
+++ trunk/src/wp-includes/media-template.php 2014-03-31 05:12:29 UTC (rev 27868)
</span><span class="lines">@@ -771,8 +771,8 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-image-editor">
</span><del>- <div id="media-head-{{{ data.id }}}"></div>
- <div id="image-editor-{{{ data.id }}}"></div>
</del><ins>+ <div id="media-head-{{ data.id }}"></div>
+ <div id="image-editor-{{ data.id }}"></div>
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-audio-details">
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx"> <label class="setting">
</span><span class="cx"> <span>SRC</span>
</span><span class="cx"> <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
</span><del>- <a class="remove-setting">{{{ wp.media.view.l10n.remove }}}</a>
</del><ins>+ <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</ins><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><span class="cx"> <?php
</span><span class="lines">@@ -809,14 +809,14 @@
</span><span class="cx"> <label class="setting">
</span><span class="cx"> <span><?php echo strtoupper( $type ) ?></span>
</span><span class="cx"> <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
</span><del>- <a class="remove-setting">{{{ wp.media.view.l10n.remove }}}</a>
</del><ins>+ <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</ins><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><span class="cx"> <?php endforeach ?>
</span><span class="cx">
</span><span class="cx"> <# if ( ! _.isEmpty( html5types ) ) { #>
</span><span class="cx"> <div class="setting">
</span><del>- <span>{{{ wp.media.view.l10n.mediaHTML5Text }}}</span>
</del><ins>+ <span><?php _e( 'Add alternate sources for maximum HTML5 playback:' ) ?></span>
</ins><span class="cx"> <div class="button-large">
</span><span class="cx"> <# _.each( html5types, function (mime, type) { #>
</span><span class="cx"> <button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
</span><span class="lines">@@ -886,7 +886,7 @@
</span><span class="cx"> <label class="setting">
</span><span class="cx"> <span>SRC</span>
</span><span class="cx"> <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
</span><del>- <a class="remove-setting">{{{ wp.media.view.l10n.remove }}}</a>
</del><ins>+ <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</ins><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><span class="cx"> <?php foreach ( $video_types as $type ):
</span><span class="lines">@@ -898,7 +898,7 @@
</span><span class="cx"> <label class="setting">
</span><span class="cx"> <span><?php echo strtoupper( $type ) ?></span>
</span><span class="cx"> <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
</span><del>- <a class="remove-setting">{{{ wp.media.view.l10n.remove }}}</a>
</del><ins>+ <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</ins><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><span class="cx"> <?php endforeach ?>
</span><span class="lines">@@ -906,7 +906,7 @@
</span><span class="cx">
</span><span class="cx"> <# if ( ! _.isEmpty( html5types ) ) { #>
</span><span class="cx"> <div class="setting">
</span><del>- <span>{{{ wp.media.view.l10n.mediaHTML5Text }}}</span>
</del><ins>+ <span><?php _e( 'Add alternate sources for maximum HTML5 playback:' ); ?></span>
</ins><span class="cx"> <div class="button-large">
</span><span class="cx"> <# _.each( html5types, function (mime, type) { #>
</span><span class="cx"> <button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
</span><span class="lines">@@ -919,7 +919,7 @@
</span><span class="cx"> <label class="setting">
</span><span class="cx"> <span><?php _e( 'Poster Image' ); ?></span>
</span><span class="cx"> <input type="text" disabled="disabled" data-setting="poster" value="{{ data.model.poster }}" />
</span><del>- <a class="remove-setting">{{{ wp.media.view.l10n.remove }}}</a>
</del><ins>+ <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</ins><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><span class="cx"> <div class="setting preload">
</span><span class="lines">@@ -952,7 +952,7 @@
</span><span class="cx"> content += track.outerHTML; #>
</span><span class="cx"> <p>
</span><span class="cx"> <input class="content-track" type="text" value="{{ track.outerHTML }}" />
</span><del>- <a class="remove-setting remove-track">{{{ wp.media.view.l10n.remove }}}</a>
</del><ins>+ <a class="remove-setting remove-track"><?php _e( 'Remove' ); ?></a>
</ins><span class="cx"> </p>
</span><span class="cx"> <# } ); #>
</span><span class="cx"> <# } else { #>
</span><span class="lines">@@ -972,11 +972,11 @@
</span><span class="cx"> <div class="toolbar">
</span><span class="cx"> <div class="dashicons dashicons-edit edit"></div><div class="dashicons dashicons-no-alt remove"></div>
</span><span class="cx"> </div>
</span><del>- <div class="gallery gallery-columns-{{{ data.columns }}}">
</del><ins>+ <div class="gallery gallery-columns-{{ data.columns }}">
</ins><span class="cx"> <# _.each( data.attachments, function( attachment, index ) { #>
</span><span class="cx"> <dl class="gallery-item">
</span><span class="cx"> <dt class="gallery-icon">
</span><del>- <img src="{{{ attachment.thumbnail.url }}}" width="{{ attachment.thumbnail.width }}" height="{{ attachment.thumbnail.height }}" />
</del><ins>+ <img src="{{ attachment.thumbnail.url }}" width="{{ attachment.thumbnail.width }}" height="{{ attachment.thumbnail.height }}" />
</ins><span class="cx"> </dt>
</span><span class="cx"> <dd class="wp-caption-text gallery-caption">
</span><span class="cx"> {{ attachment.caption }}
</span><span class="lines">@@ -996,7 +996,7 @@
</span><span class="cx"> <div class="dashicons dashicons-no-alt remove"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <# if ( ! _.isEmpty( data.model.caption ) ) { #>
</span><del>- <div class="track-details">{{{ data.model.caption }}}</div>
</del><ins>+ <div class="track-details">{{ data.model.caption }}</div>
</ins><span class="cx"> <# } #>
</span><span class="cx"> <?php wp_underscore_audio_template() ?>
</span><span class="cx"> <div class="wpview-overlay"></div>
</span><span class="lines">@@ -1008,7 +1008,7 @@
</span><span class="cx"> <div class="dashicons dashicons-no-alt remove"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <# if ( ! _.isEmpty( data.model.caption ) ) { #>
</span><del>- <div class="track-details">{{{ data.model.caption }}}</div>
</del><ins>+ <div class="track-details">{{ data.model.caption }}</div>
</ins><span class="cx"> <# } #>
</span><span class="cx"> <?php wp_underscore_video_template() ?>
</span><span class="cx"> <div class="wpview-overlay"></div>
</span></span></pre>
</div>
</div>
</body>
</html>