Changes in branches/3.5/wp-includes/media.php [23317:23140]

File:

• branches/3.5/wp-includes/media.php (modified) (5 diffs)

branches/3.5/wp-includes/media.php

@@ -736 +736 @@
     $itemtag = tag_escape($itemtag);
     $captiontag = tag_escape($captiontag);
-    $icontag = tag_escape($icontag);
-    $valid_tags = wp_kses_allowed_html( 'post' );
-    if ( ! isset( $valid_tags[ $itemtag ] ) )
-        $itemtag = 'dl';
-    if ( ! isset( $valid_tags[ $captiontag ] ) )
-        $captiontag = 'dd';
-    if ( ! isset( $valid_tags[ $icontag ] ) )
-        $icontag = 'dt';
-
     $columns = intval($columns);
     $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
@@ -1401 +1392 @@
 
                 // We have the actual image size, but might need to further constrain it if content_width is narrower.
-                // Thumbnail, medium, and full sizes are also checked against the site's height/width options.
-                list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );
+                // This is not necessary for thumbnails and medium size.
+                if ( 'thumbnail' == $size || 'medium' == $size ) {
+                    $width = $size_meta['width'];
+                    $height = $size_meta['height'];
+                } else {
+                    list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );
+                }
 
                 $sizes[ $size ] = array(
@@ -1436 +1432 @@
  */
 function wp_enqueue_media( $args = array() ) {
-
-    // Enqueue me just once per page, please.
-    if ( did_action( 'wp_enqueue_media' ) )
-        return;
-
     $defaults = array(
         'post' => null,
@@ -1458 +1449 @@
     $tabs = apply_filters( 'media_upload_tabs', $tabs );
     unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );
-
-    $props = array(
-        'link'  => get_option( 'image_default_link_type' ), // db default is 'file'
-        'align' => get_option( 'image_default_align' ), // empty default
-        'size'  => get_option( 'image_default_size' ),  // empty default
-    );
 
     $settings = array(
@@ -1476 +1461 @@
             'id' => 0,
         ),
-        'defaultProps' => $props,
     );