Changeset 27785 for trunk/src/wp-includes/media.php

Timestamp:

03/27/2014 05:57:30 PM (12 years ago)

Author:

wonderboymusic

Message:

There is no more video-playlist shortcode. To use video, it is now [playlist type="video" ....]. Also deleting core playlist styles. The style attribute is still supported, defaulting to light. Our core style support was 4-5 CSS rules.

See #27552. Leaving open for comments and potential bugs.

File:

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

trunk/src/wp-includes/media.php

@@ -1073 +1073 @@
  *
  * @param array  $attr Attributes of the shortcode.
- * @param string $type Type of playlist. Accepts 'audio' and 'video'.
  * @return string Playlist output. Empty string if the passed type is unsupported.
  */
-function wp_get_playlist( $attr, $type ) {
+function wp_playlist_shortcode( $attr ) {
     global $content_width;
     $post = get_post();
-
-    if ( ! in_array( $type, array( 'audio', 'video' ) ) ) {
-        return '';
-    }
 
     static $instance = 0;
@@ -1107 +1102 @@
      * @param string $type   Type of playlist to generate output for.
      */
-    $output = apply_filters( 'post_playlist', '', $attr, $type );
+    $output = apply_filters( 'post_playlist', '', $attr );
     if ( $output != '' ) {
         return $output;
@@ -1123 +1118 @@
 
     extract( shortcode_atts( array(
+        'type'      => 'audio',
         'order'     => 'ASC',
         'orderby'   => 'menu_order ID',
@@ -1129 +1125 @@
         'exclude'   => '',
         'style'     => 'light',
-        'tracklist' => 'audio' === $type,
-        'tracknumbers' => 'audio' === $type,
+        'tracklist' => true,
+        'tracknumbers' => true,
         'images'    => true,
         'artists'   => true
@@ -1138 +1134 @@
     if ( 'RAND' == $order ) {
         $orderby = 'none';
-    }
-
-    $playlist_styles = array(
-        'light' => _x( 'Light', 'playlist theme' ),
-        'dark'  => _x( 'Dark', 'playlist theme' )
-    );
-
-    /**
-     * Filter the available playlist styles.
-     *
-     * @since 3.9.0
-     *
-     * @param array $playlist_styles Array of playlist styles. Defaults are 'light' and 'dark'.
-     */
-    $styles = apply_filters( 'playlist_styles', $playlist_styles );
-
-    if ( ! in_array( $style, array_keys( $styles ), true ) ) {
-        $style = 'light';
     }
 
@@ -1203 +1181 @@
     $theme_height = empty( $content_width ) ? $default_height : round( ( $default_height * $theme_width ) / $default_width );
 
-    $data = compact( 'type', 'style' );
+    $data = compact( 'type' );
 
     // don't pass strings to JSON, will be truthy in JS
@@ -1312 +1290 @@
     return ob_get_clean();
 }
-
-/**
- * Playlist shortcode handler
- *
- * @since 3.9.0
- *
- * @param array $attr Parsed shortcode attributes.
- * @return string The resolved playlist shortcode markup.
- */
-function wp_playlist_shortcode( $attr ) {
-    return wp_get_playlist( $attr, 'audio' );
-}
 add_shortcode( 'playlist', 'wp_playlist_shortcode' );
-
-/**
- * Video playlist shortcode handler
- *
- * @since 3.9.0
- *
- * @param array $attr Parsed shortcode attributes.
- * @return string The resolved video playlist shortcode markup.
- */
-function wp_video_playlist_shortcode( $attr ) {
-    return wp_get_playlist( $attr, 'video' );
-}
-add_shortcode( 'video-playlist', 'wp_video_playlist_shortcode' );
 
 /**