<!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>[28837] trunk/src/wp-admin: In `media_buttons()`, add a static var `$instance` to increment the `id` attribute of `insert-media-button-%d` on each call.</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/28837">28837</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-26 01:04:32 +0000 (Thu, 26 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `media_buttons()`, add a static var `$instance` to increment the `id` attribute of `insert-media-button-%d` on each call.
Props ericlewis.
Fixes <a href="http://core.trac.wordpress.org/ticket/28090">#28090</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-form-advanced.php (28836 => 28837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-form-advanced.php 2014-06-26 00:56:07 UTC (rev 28836)
+++ trunk/src/wp-admin/edit-form-advanced.php 2014-06-26 01:04:32 UTC (rev 28837)
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> <?php wp_editor( $post->post_content, 'content', array(
</span><span class="cx"> 'dfw' => true,
</span><span class="cx"> 'drag_drop_upload' => true,
</span><del>- 'tabfocus_elements' => 'insert-media-button,save-post',
</del><ins>+ 'tabfocus_elements' => 'insert-media-button-1,save-post',
</ins><span class="cx"> 'editor_height' => 360,
</span><span class="cx"> 'tinymce' => array(
</span><span class="cx"> 'resize' => false,
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/media.php (28836 => 28837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/media.php 2014-06-26 00:56:07 UTC (rev 28836)
+++ trunk/src/wp-admin/includes/media.php 2014-06-26 01:04:32 UTC (rev 28837)
</span><span class="lines">@@ -514,6 +514,9 @@
</span><span class="cx"> * @param string $editor_id
</span><span class="cx"> */
</span><span class="cx"> function media_buttons($editor_id = 'content') {
</span><ins>+ static $instance = 0;
+ $instance++;
+
</ins><span class="cx"> $post = get_post();
</span><span class="cx"> if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
</span><span class="cx"> $post = $GLOBALS['post_ID'];
</span><span class="lines">@@ -524,8 +527,12 @@
</span><span class="cx">
</span><span class="cx"> $img = '<span class="wp-media-buttons-icon"></span> ';
</span><span class="cx">
</span><del>- echo '<a href="#" id="insert-media-button" class="button insert-media add_media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . __( 'Add Media' ) . '</a>';
-
</del><ins>+ printf( '<a href="#" id="insert-media-button-%d" class="button insert-media add_media" data-editor="%s" title="%s">%s</a>',
+ $instance,
+ esc_attr( $editor_id ),
+ esc_attr__( 'Add Media' ),
+ $img . __( 'Add Media' )
+ );
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the legacy (pre-3.5.0) media buttons.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>