<!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>[31305] trunk/src/wp-includes/media.php: Rename `$instances` to `$instance` in wp_audio_shortcode() and wp_video_shortcode() for consistency with gallery_shortcode() and wp_playlist_shortcode().</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/31305">31305</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/31305","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-30 16:05:52 +0000 (Fri, 30 Jan 2015)</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'>Rename `$instances` to `$instance` in wp_audio_shortcode() and wp_video_shortcode() for consistency with gallery_shortcode() and wp_playlist_shortcode().
see <a href="https://core.trac.wordpress.org/ticket/31151">#31151</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2015-01-30 16:01:25 UTC (rev 31304)
+++ trunk/src/wp-includes/media.php 2015-01-30 16:05:52 UTC (rev 31305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1492,7 +1492,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $preload The 'preload' attribute for the `<audio>` element. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $class The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $id The 'id' attribute for the `<audio>` element. Default 'audio-{$post_id}-{$instances}'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $id The 'id' attribute for the `<audio>` element. Default 'audio-{$post_id}-{$instance}'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $style The 'style' attribute for the `<audio>` element. Default 'width: 100%'.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content Optional. Shortcode content.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1501,8 +1501,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_audio_shortcode( $attr, $content = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = get_post() ? get_the_ID() : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static $instances = 0;
- $instances++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $instance = 0;
+ $instance++;
</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"> * Filter the default audio shortcode output.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1511,12 +1511,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $html Empty variable to be replaced with shortcode markup.
- * @param array $attr Attributes of the shortcode. @see wp_audio_shortcode()
- * @param string $content Shortcode content.
- * @param int $instances Unique numeric ID of this audio shortcode instance.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $html Empty variable to be replaced with shortcode markup.
+ * @param array $attr Attributes of the shortcode. @see wp_audio_shortcode()
+ * @param string $content Shortcode content.
+ * @param int $instance Unique numeric ID of this audio shortcode instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $override = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instances );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $override = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instance );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $override ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $override;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1592,7 +1592,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $html_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => sprintf( 'audio-%d-%d', $post_id, $instances ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => sprintf( 'audio-%d-%d', $post_id, $instance ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'loop' => wp_validate_boolean( $atts['loop'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'preload' => $atts['preload'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1612,7 +1612,7 @@
</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"> $html = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'mediaelement' === $library && 1 === $instances ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'mediaelement' === $library && 1 === $instance ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html .= "<!--[if lt IE 9]><script>document.createElement('audio');</script><![endif]-->\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1625,7 +1625,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fileurl = $atts[ $fallback ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = add_query_arg( '_', $instances, $atts[ $fallback ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = add_query_arg( '_', $instance, $atts[ $fallback ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf( $source, $type['type'], esc_url( $url ) );
</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">@@ -1690,7 +1690,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $class The 'class' attribute for the `<video>` element.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'wp-video-shortcode'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $id The 'id' attribute for the `<video>` element.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default 'video-{$post_id}-{$instances}'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default 'video-{$post_id}-{$instance}'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content Optional. Shortcode content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML content to display video.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1699,8 +1699,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $content_width;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = get_post() ? get_the_ID() : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static $instances = 0;
- $instances++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $instance = 0;
+ $instance++;
</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"> * Filter the default video shortcode output.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1712,12 +1712,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_video_shortcode()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $html Empty variable to be replaced with shortcode markup.
- * @param array $attr Attributes of the video shortcode.
- * @param string $content Video shortcode content.
- * @param int $instances Unique numeric ID of this video shortcode instance.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $html Empty variable to be replaced with shortcode markup.
+ * @param array $attr Attributes of the video shortcode.
+ * @param string $content Video shortcode content.
+ * @param int $instance Unique numeric ID of this video shortcode instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instances );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instance );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $override ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $override;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1824,7 +1824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $html_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => sprintf( 'video-%d-%d', $post_id, $instances ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => sprintf( 'video-%d-%d', $post_id, $instance ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'width' => absint( $atts['width'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => absint( $atts['height'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'poster' => esc_url( $atts['poster'] ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1846,7 +1846,7 @@
</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"> $html = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'mediaelement' === $library && 1 === $instances ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'mediaelement' === $library && 1 === $instance ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html .= "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1865,7 +1865,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = add_query_arg( '_', $instances, $atts[ $fallback ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = add_query_arg( '_', $instance, $atts[ $fallback ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf( $source, $type['type'], esc_url( $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>