Ticket #26530: fix_do_enclose.diff

src/wp-includes/functions.php

@@ -450 +450 @@
 function do_enclose( $content, $post_ID ) {
         global $wpdb;
 
-        //TODO: Tidy this ghetto code up and make the debug code optional
         include_once( ABSPATH . WPINC . '/class-IXR.php' );
 
-        $post_links = array();
+        $post_enclosed_links = get_enclosed( $post_ID );
+        $content_links_all = (array) wp_extract_urls( $content );
 
-        $pung = get_enclosed( $post_ID );
-
-        $post_links_temp = wp_extract_urls( $content );
-
-        foreach ( $pung as $link_test ) {
-                if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
-                        $mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, like_escape( $link_test ) . '%') );
+        // Remove metadata references for links no longer in post
+        foreach ( $post_enclosed_links as $link ) {
+                if ( ! in_array( $link, $content_links_all ) ) { // link no longer in post
+                        // This isn't really optimal but until there's a better helper function to do this..
+                        $mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, like_escape( $link ) . '%') );
                         foreach ( $mids as $mid )
                                 delete_metadata_by_mid( 'post', $mid );
                 }
         }
-
-        foreach ( (array) $post_links_temp as $link_test ) {
-                if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
-                        $test = @parse_url( $link_test );
-                        if ( false === $test )
-                                continue;
-                        if ( isset( $test['query'] ) )
-                                $post_links[] = $link_test;
-                        elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
-                                $post_links[] = $link_test;
+        
+        // Adds post metadata for new links to content of certain types
+        foreach ($content_links_all as $link ) {
+                // Link not already referenced for metadata and is valid
+                if ( !in_array( $link, $post_enclosed_links ) &&
+                        url_valid_for_enclosure_addition( $link ) ) {
+                                add_enclosure_if_multimedia_link( $link, $post_ID );
                 }
         }
+}
 
-        foreach ( (array) $post_links as $url ) {
-                if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, like_escape( $url ) . '%' ) ) ) {
+/**
+ * Is this URL syntatically valid and not pointing to site root?
+ *
+ * @since ?
+ *
+ * @param string $url
+ * @return bool Is url valid?
+ */
+function url_valid_for_enclosure_addition( $url ) {
+        $test = WP_DEBUG ? parse_url( $url ) : @parse_url( $url );
+        if ( false === $test ) {
+                return false;
+        }
+        // Valid link not pointing to site root?
+        return ( isset( $test['query'] ) || ( isset($test['path']) && $test['path'] != '/' && $test['path'] != '' ) );
+}
 
-                        if ( $headers = wp_get_http_headers( $url) ) {
-                                $len = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
-                                $type = isset( $headers['content-type'] ) ? $headers['content-type'] : '';
-                                $allowed_types = array( 'video', 'audio' );
+/**
+ * Adds metadata for post link if headers of url is of any of the specified types
+ * If no headers are accessible, try guessing the mime type from the file extension and possibly add an enclosure.
+ * @since ?
+ *
+ * @param string $url
+ * @param int $post_ID Post ID
+ */
+function add_enclosure_if_multimedia_link( $url, $post_ID ){
+        $allowed_types = array( 'video', 'audio' );
 
-                                // Check to see if we can figure out the mime type from
-                                // the extension
-                                $url_parts = @parse_url( $url );
-                                if ( false !== $url_parts ) {
-                                        $extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
-                                        if ( !empty( $extension ) ) {
-                                                foreach ( wp_get_mime_types() as $exts => $mime ) {
-                                                        if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
-                                                                $type = $mime;
-                                                                break;
-                                                        }
-                                                }
-                                        }
-                                }
+        $headers = wp_get_http_headers( $url);
+        $length = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
+        if (isset( $headers['content-type'] ) ) {
+                // Filters out charset declarations etc
+                preg_match("/^([a-z0-9]*\/[a-z0-9]*)/", $headers['content-type'], $matches);
+                // Just a safeguard. The longtext type in mysql 5 supports 4GiB of information
+                $mime = substr($matches[1], 0, 256);
+        }
+        else {
+                $mime = find_mime_type_from_extension($url);
+                // Mime type not possible to ascertain
+                if (false === $mime) {
+                        return false;
+                }
+        }
 
-                                if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
-                                        add_post_meta( $post_ID, 'enclosure', "$url\n$len\n$mime\n" );
-                                }
-                        }
+        if ( in_array( substr( $mime, 0, strpos( $mime, "/" ) ), $allowed_types ) ) {
+                add_post_meta( $post_ID, 'enclosure', "$url\n$length\n$mime\n" );
+        }
+}
+
+/**
+ * Attempts to find the mime type for a link
+ *
+ * @since ?
+ *
+ * @param string $url
+ * @return bool|string False on failure and mime type string if found
+ */
+function find_mime_type_from_extension( $url ){
+        $url_parts = WP_DEBUG ? parse_url( $url ) : @parse_url( $url );
+        if ( false === $url_parts ){
+                return false;
+        }
+        $extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
+        if ( empty( $extension ) ) {
+                return false;
+        }
+        $all_mime_types = wp_get_mime_types();
+        foreach ( $all_mime_types as $exts => $mime ) {
+                if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
+                        return $mime;
                 }
         }
+        return false;
 }
 
 /**