Ticket #23219: FixDuplicateEnclosures.diff

wp-includes/functions.php

@@ -468 +468 @@
                                 }
 
                                 if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
-                                        add_post_meta( $post_ID, 'enclosure', "$url\n$len\n$mime\n" );
+                                        add_post_meta( $post_ID, 'enclosure', "$url\n$len\n$mime" );
                                 }
                         }
                 }

wp-includes/class-wp-xmlrpc-server.php

@@ -4308 +4308 @@
                         foreach ( (array) get_post_custom($post_ID) as $key => $val) {
                                 if ($key == 'enclosure') {
                                         foreach ( (array) $val as $enc ) {
-                                                if ($enc == $encstring) {
+                                                // Trim the existing enclosure string in case it was saved with a trailing newline
+                                                if (trim($enc) == $encstring) {
                                                         $found = true;
                                                         break 2;
                                                 }