Changeset 31305

Timestamp:

01/30/2015 04:05:52 PM (12 years ago)

Author:

SergeyBiryukov

Message:

Rename $instances to $instance in wp_audio_shortcode() and wp_video_shortcode() for consistency with gallery_shortcode() and wp_playlist_shortcode().

see #31151.

File:

• trunk/src/wp-includes/media.php (modified) (12 diffs)

trunk/src/wp-includes/media.php

@@ -1493 +1493 @@
  *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default empty.
  *     @type string $class    The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
- *     @type string $id       The 'id' attribute for the `<audio>` element. Default 'audio-{$post_id}-{$instances}'.
+ *     @type string $id       The 'id' attribute for the `<audio>` element. Default 'audio-{$post_id}-{$instance}'.
  *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%'.
  * }
@@ -1502 +1502 @@
         $post_id = get_post() ? get_the_ID() : 0;
 
-        static $instances = 0;
-        $instances++;
+        static $instance = 0;
+        $instance++;
 
         /**
@@ -1512 +1512 @@
          * @since 3.6.0
          *
-         * @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.
-         */
-        $override = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instances );
+         * @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.
+         */
+        $override = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instance );
         if ( '' !== $override ) {
                 return $override;
@@ -1593 +1593 @@
         $html_atts = array(
                 'class'    => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ),
-                'id'       => sprintf( 'audio-%d-%d', $post_id, $instances ),
+                'id'       => sprintf( 'audio-%d-%d', $post_id, $instance ),
                 'loop'     => wp_validate_boolean( $atts['loop'] ),
                 'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
@@ -1613 +1613 @@
 
         $html = '';
-        if ( 'mediaelement' === $library && 1 === $instances ) {
+        if ( 'mediaelement' === $library && 1 === $instance ) {
                 $html .= "<!--[if lt IE 9]><script>document.createElement('audio');</script><![endif]-->\n";
         }
@@ -1626 +1626 @@
                         }
                         $type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
-                        $url = add_query_arg( '_', $instances, $atts[ $fallback ] );
+                        $url = add_query_arg( '_', $instance, $atts[ $fallback ] );
                         $html .= sprintf( $source, $type['type'], esc_url( $url ) );
                 }
@@ -1691 +1691 @@
  *                            Default 'wp-video-shortcode'.
  *     @type string $id       The 'id' attribute for the `<video>` element.
- *                            Default 'video-{$post_id}-{$instances}'.
+ *                            Default 'video-{$post_id}-{$instance}'.
  * }
  * @param string $content Optional. Shortcode content.
@@ -1700 +1700 @@
         $post_id = get_post() ? get_the_ID() : 0;
 
-        static $instances = 0;
-        $instances++;
+        static $instance = 0;
+        $instance++;
 
         /**
@@ -1713 +1713 @@
          * @see wp_video_shortcode()
          *
-         * @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.
-         */
-        $override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instances );
+         * @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.
+         */
+        $override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instance );
         if ( '' !== $override ) {
                 return $override;
@@ -1825 +1825 @@
         $html_atts = array(
                 'class'    => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ),
-                'id'       => sprintf( 'video-%d-%d', $post_id, $instances ),
+                'id'       => sprintf( 'video-%d-%d', $post_id, $instance ),
                 'width'    => absint( $atts['width'] ),
                 'height'   => absint( $atts['height'] ),
@@ -1847 +1847 @@
 
         $html = '';
-        if ( 'mediaelement' === $library && 1 === $instances ) {
+        if ( 'mediaelement' === $library && 1 === $instance ) {
                 $html .= "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n";
         }
@@ -1866 +1866 @@
                                 $type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
                         }
-                        $url = add_query_arg( '_', $instances, $atts[ $fallback ] );
+                        $url = add_query_arg( '_', $instance, $atts[ $fallback ] );
                         $html .= sprintf( $source, $type['type'], esc_url( $url ) );
                 }