Changeset 25484

Timestamp:

09/18/2013 09:19:20 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Replace non-functional 'wp_audio_shortcode_handler' and 'wp_video_shortcode_handler' filters with 'wp_audio_shortcode_override' and 'wp_video_shortcode_override'.

props ericlewis, SergeyBiryukov.
fixes #25313.

File:

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

trunk/src/wp-includes/media.php

@@ -883 +883 @@
     $instances++;
 
+    /**
+     * Override the default audio shortcode.
+     *
+     * @since 3.7.0
+     *
+     * @param null             Empty variable to be replaced with shortcode markup.
+     * @param array $attr      Attributes of the shortcode.
+     * @param int   $instances Unique numeric ID of this audio shortcode instance.
+     */
+    $html = apply_filters( 'wp_audio_shortcode_override', null, $attr, $instances );
+    if ( null !== $html )
+        return $html;
+
     $audio = null;
 
@@ -976 +989 @@
     return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library );
 }
-add_shortcode( 'audio', apply_filters( 'wp_audio_shortcode_handler', 'wp_audio_shortcode' ) );
+add_shortcode( 'audio', 'wp_audio_shortcode' );
 
 /**
@@ -1005 +1018 @@
     static $instances = 0;
     $instances++;
+
+    /**
+     * Override the default video shortcode.
+     *
+     * @since 3.7.0
+     *
+     * @param null             Empty variable to be replaced with shortcode markup.
+     * @param array $attr      Attributes of the shortcode.
+     * @param int   $instances Unique numeric ID of this video shortcode instance.
+     */
+    $html = apply_filters( 'wp_video_shortcode_override', null, $attr, $instances );
+    if ( null !== $html )
+        return $html;
 
     $video = null;
@@ -1120 +1146 @@
     return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id, $library );
 }
-add_shortcode( 'video', apply_filters( 'wp_video_shortcode_handler', 'wp_video_shortcode' ) );
+add_shortcode( 'video', 'wp_video_shortcode' );
 
 /**