Ticket #33591: 33591.4.diff

feed.php

@@ -501 +501 @@
         foreach ( (array) get_post_custom() as $key => $val ) {
                 if ($key == 'enclosure') {
                         foreach ( (array) $val as $enc ) {
-                                $enclosure = explode("\n", $enc);
+                                $enclosure = explode( "\n", $enc );
+        
+                                $new_enclosure = array( 'href' => trim( htmlspecialchars( $enclosure[0] ) ) );
+                                unset( $enclosure[0] );
+        
+                                $mimes = get_allowed_mime_types();
+                                $mime_valid = false;
+                                
+                                foreach ( $enclosure as $enclosure_key => $item ) {
+                                        
+                                        if ( ! isset( $new_enclosure['length'] ) ) {
+                                                if ( is_numeric( $item ) ) {
+                                                        $new_enclosure['length'] = trim( htmlspecialchars( $item ) );
+                                                        unset( $enclosure[$enclosure_key] );
+                                                }
+                                        }
+                                        
+                                        if ( ! isset( $new_enclosure['type'] ) ) {
+                                                foreach ( $mimes as $type => $mime ) {
+                                                        if ( strpos( $mime, $item ) !== false ) {
+                                                                $new_enclosure['type'] = trim( htmlspecialchars( $item ) );
+                                                                unset( $enclosure[$enclosure_key] );
+                                                                break;
+                                                        }
+                                                }
+                                        }
+                                        
+                                }
+                                
+                                $new_enclosure = array_merge( $new_enclosure, array_values( $enclosure ) );
+                                
                                 /**
                                  * Filter the atom enclosure HTML link tag for the current post.
                                  *
@@ -509 +539 @@
                                  *
                                  * @param string $html_link_tag The HTML link tag with a URI and other attributes.
                                  */
-                                echo apply_filters( 'atom_enclosure', '<link href="' . trim( htmlspecialchars( $enclosure[0] ) ) . '" rel="enclosure" length="' . trim( $enclosure[1] ) . '" type="' . trim( $enclosure[2] ) . '" />' . "\n" );
+                                echo apply_filters( 'atom_enclosure', '<link href="' . $new_enclosure['href'] . '" rel="enclosure" length="' . $new_enclosure['length'] . '" type="' . $new_enclosure['type'] . '" />' . "\n" );
                         }
                 }
         }