Changes in trunk/wp-includes/media.php [15003:16865]

File:

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

trunk/wp-includes/media.php

@@ -138 +138 @@
         $width = $height = 0;
         $is_intermediate = false;
+        $img_url_basename = wp_basename($img_url);
 
         // plugins can use this to provide resize services
@@ -145 +146 @@
         // try for a new style intermediate size
         if ( $intermediate = image_get_intermediate_size($id, $size) ) {
-                $img_url = str_replace(basename($img_url), $intermediate['file'], $img_url);
+                $img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
                 $width = $intermediate['width'];
                 $height = $intermediate['height'];
@@ -153 +154 @@
                 // fall back to the old thumbnail
                 if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
-                        $img_url = str_replace(basename($img_url), basename($thumb_file), $img_url);
+                        $img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
                         $width = $info[0];
                         $height = $info[1];
@@ -178 +179 @@
  * Registers a new image size
  */
-function add_image_size( $name, $width = 0, $height = 0, $crop = FALSE ) {
+function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
         global $_wp_additional_image_sizes;
-        $_wp_additional_image_sizes[$name] = array( 'width' => absint( $width ), 'height' => absint( $height ), 'crop' => !!$crop );
+        $_wp_additional_image_sizes[$name] = array( 'width' => absint( $width ), 'height' => absint( $height ), 'crop' => (bool) $crop );
 }
 
@@ -186 +187 @@
  * Registers an image size for the post thumbnail
  */
-function set_post_thumbnail_size( $width = 0, $height = 0, $crop = FALSE ) {
+function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
         add_image_size( 'post-thumbnail', $width, $height, $crop );
 }
@@ -437 +438 @@
         $dir = $info['dirname'];
         $ext = $info['extension'];
-        $name = basename($file, ".{$ext}");
+        $name = wp_basename($file, ".$ext");
+
         if ( !is_null($dest_path) and $_dest_path = realpath($dest_path) )
                 $dir = $_dest_path;
@@ -486 +488 @@
                         $resized_file = apply_filters('image_make_intermediate_size', $resized_file);
                         return array(
-                                'file' => basename( $resized_file ),
+                                'file' => wp_basename( $resized_file ),
                                 'width' => $info[0],
                                 'height' => $info[1],
@@ -607 +609 @@
         if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
                 $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
-                $src_file = $icon_dir . '/' . basename($src);
+                $src_file = $icon_dir . '/' . wp_basename($src);
                 @list($width, $height) = getimagesize($src_file);
         }
@@ -822 +824 @@
         $selector = "gallery-{$instance}";
 
-        $output = apply_filters('gallery_style', "
+        $gallery_style = $gallery_div = '';
+        if ( apply_filters( 'use_default_gallery_style', true ) )
+                $gallery_style = "
                 <style type='text/css'>
                         #{$selector} {
@@ -831 +835 @@
                                 margin-top: 10px;
                                 text-align: center;
-                                width: {$itemwidth}%;                   }
+                                width: {$itemwidth}%;
+                        }
                         #{$selector} img {
                                 border: 2px solid #cfcfcf;
@@ -839 +844 @@
                         }
                 </style>
-                <!-- see gallery_shortcode() in wp-includes/media.php -->
-                <div id='$selector' class='gallery galleryid-{$id}'>");
+                <!-- see gallery_shortcode() in wp-includes/media.php -->";
+        $size_class = sanitize_html_class( $size );
+        $gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
+        $output = apply_filters( 'gallery_style', $gallery_style . "\n\t\t" . $gallery_div );
 
         $i = 0;
@@ -853 +860 @@
                 if ( $captiontag && trim($attachment->post_excerpt) ) {
                         $output .= "
-                                <{$captiontag} class='gallery-caption'>
+                                <{$captiontag} class='wp-caption-text gallery-caption'>
                                 " . wptexturize($attachment->post_excerpt) . "
                                 </{$captiontag}>";
@@ -961 +968 @@
  * @since 2.9.0
  *
- * @param $mime_type string
+ * @param string $mime_type
  * @return bool
  */
@@ -992 +999 @@
  * @since 2.9.0
  *
- * @param $width
- * @param $height
+ * @param int $width Image width
+ * @param int $height Image height
  * @return image resource
  */
@@ -1064 +1071 @@
                 global $shortcode_tags;
 
-                // Backup current registered shortcodes and clear them all out
+                // Back up current registered shortcodes and clear them all out
                 $orig_shortcode_tags = $shortcode_tags;
                 remove_all_shortcodes();
@@ -1157 +1164 @@
                 $attr = wp_parse_args( $attr, wp_embed_defaults() );
 
+                // kses converts & into &amp; and we need to undo this
+                // See http://core.trac.wordpress.org/ticket/11311
+                $url = str_replace( '&amp;', '&', $url );
+
                 // Look for known internal handlers
                 ksort( $this->handlers );
@@ -1185 +1196 @@
 
                                 if ( !empty($cache) )
-                                        return apply_filters( 'embed_oembed_html', $cache, $url, $attr );
+                                        return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_ID );
                         }
 
@@ -1198 +1209 @@
                         // If there was a result, return it
                         if ( $html )
-                                return apply_filters( 'embed_oembed_html', $html, $url, $attr );
+                                return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_ID );
                 }