Ticket #16747: 16747.diff

wp-includes/feed.php

@@ -369 +369 @@
  * the user has the password for the post. If not then it will return before
  * displaying.
  *
- * Also uses the function get_post_custom() to get the post's 'enclosure'
+ * Also uses the function get_post_meta() to get the post's 'enclosure'
  * metadata field and parses the value to display the enclosure(s). The
  * enclosure(s) consist of enclosure HTML tag(s) with a URI and other
  * attributes.
@@ -377 +377 @@
  * @package WordPress
  * @subpackage Template
  * @since 1.5.0
- * @uses apply_filters() Calls 'rss_enclosure' hook on rss enclosure.
- * @uses get_post_custom() To get the current post enclosure metadata.
+ * @uses apply_filters() Calls 'rss_enclosure' hook on rss enclosure and 'rss_enclosures' hook on all rss enclosures.
+ * @uses get_post_meta() To get the current post enclosure metadata.
  */
 function rss_enclosure() {
         if ( post_password_required() )
                 return;
 
-        foreach ( (array) get_post_custom() as $key => $val) {
-                if ($key == 'enclosure') {
-                        foreach ( (array) $val as $enc ) {
-                                $enclosure = explode("\n", $enc);
+        $output = '';
+        $post_id = get_the_ID();
+        $encs = get_post_meta( $post_id, 'enclosure' );
 
-                                //only get the the first element eg, audio/mpeg from 'audio/mpeg mpga mp2 mp3'
-                                $t = preg_split('/[ \t]/', trim($enclosure[2]) );
-                                $type = $t[0];
+        if ( !$encs )
+                return;
 
-                                echo apply_filters('rss_enclosure', '<enclosure url="' . trim(htmlspecialchars($enclosure[0])) . '" length="' . trim($enclosure[1]) . '" type="' . $type . '" />' . "\n");
-                        }
-                }
+        foreach ( $encs as $enc ) {
+                $enclosure = array_map( 'trim', explode( "\n", $enc ) );
+
+                //only get the the first element eg, audio/mpeg from 'audio/mpeg mpga mp2 mp3'
+                list( $type ) = preg_split( '/[ \t]/', $enclosure[2] );
+
+                $output .= apply_filters( 'rss_enclosure', "\t\t" . '<enclosure url="' . htmlspecialchars( $enclosure[0] ) . '" length="' . $enclosure[1] . '" type="' . $type . '" />' . "\n", $enclosure );
         }
+
+        echo apply_filters( 'rss_enclosures', $output );
 }
 
 /**
@@ -406 +410 @@
  * the user has the password for the post. If not then it will return before
  * displaying.
  *
- * Also uses the function get_post_custom() to get the post's 'enclosure'
+ * Also uses the function get_post_meta() to get the post's 'enclosure'
  * metadata field and parses the value to display the enclosure(s). The
  * enclosure(s) consist of link HTML tag(s) with a URI and other attributes.
  *
  * @package WordPress
  * @subpackage Template
  * @since 2.2.0
- * @uses apply_filters() Calls 'atom_enclosure' hook on atom enclosure.
- * @uses get_post_custom() To get the current post enclosure metadata.
+ * @uses apply_filters() Calls 'atom_enclosure' hook on atom enclosure and 'atom_enclosures' hook on all atom enclosures.
+ * @uses get_post_meta() To get the current post enclosure metadata.
  */
 function atom_enclosure() {
         if ( post_password_required() )
                 return;
 
-        foreach ( (array) get_post_custom() as $key => $val ) {
-                if ($key == 'enclosure') {
-                        foreach ( (array) $val as $enc ) {
-                                $enclosure = split("\n", $enc);
-                                echo apply_filters('atom_enclosure', '<link href="' . trim(htmlspecialchars($enclosure[0])) . '" rel="enclosure" length="' . trim($enclosure[1]) . '" type="' . trim($enclosure[2]) . '" />' . "\n");
-                        }
-                }
+        $output = '';
+        $post_id = get_the_ID();
+        $encs = get_post_meta( $post_id, 'enclosure' );
+
+        if ( !$encs )
+                return;
+
+        foreach ( $encs as $enc ) {
+                $enclosure = array_map( 'trim', explode( "\n", $enc ) );
+                $output .= apply_filters( 'atom_enclosure', "\t\t" . '<link href="' . htmlspecialchars( $enclosure[0] ) . '" rel="enclosure" length="' . $enclosure[1] . '" type="' . $enclosure[2] . '" />' . "\n", $enclosure );
         }
+
+        echo apply_filters( 'atom_enclosures', $output );
 }
 
 /**