Changeset 11462

Timestamp:

05/26/2009 10:33:02 PM (17 years ago)

Author:

azaozz

Message:

Fix the inserting of caption shortcode when the upload path contains "align"

File:

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

trunk/wp-admin/includes/media.php

@@ -131 +131 @@
 function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
 
-        if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html;
+        if ( empty($alt) || apply_filters( 'disable_captions', '' ) )
+                return $html;
+
         $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
         preg_match( '/width="([0-9]+)/', $html, $matches );
-        if ( ! isset($matches[1]) ) return $html;
+        if ( ! isset($matches[1]) )
+                return $html;
+
         $width = $matches[1];
 
-        $html = preg_replace( '/align[^\s\'"]+\s?/', '', $html );
-        if ( empty($align) ) $align = 'none';
+        $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
+        if ( empty($align) )
+                $align = 'none';
 
         $alt = ! empty($alt) ? addslashes($alt) : '';
@@ -428 +433 @@
         if ( isset($send_id) ) {
                 $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
+
                 $html = $attachment['post_title'];
                 if ( !empty($attachment['url']) ) {
@@ -434 +440 @@
                         $html = "<a href='{$attachment['url']}'$rel>$html</a>";
                 }
+                
+                
+                
+                
                 $html = apply_filters('media_send_to_editor', $html, $send_id, $attachment);
+                
+                
+                
+                
+                
+                
+
+
+
+
+
+
+
+                
+                
+                
+                
                 return media_send_to_editor($html);
         }