Ticket #9064: 9064.diff

wordpress/wp-includes/comment.php

@@ -1815 +1815 @@
 
         $pung = get_pung($post_ID);
 
-        // Variables
-        $ltrs = '\w';
-        $gunk = '/#~:.?+=&%@!\-';
-        $punc = '.:?\-';
-        $any = $ltrs . $gunk . $punc;
-
         // Step 1
         // Parsing the post, external links (if any) are stored in the $post_links array
-        // This regexp comes straight from phpfreaks.com
-        // http://www.phpfreaks.com/quickcode/Extract_All_URLs_on_a_Page/15.php
-        preg_match_all("{\b http : [$any] +? (?= [$punc] * [^$any] | $)}x", $content, $post_links_temp);
+        $post_links_temp = wp_extract_urls( $content );
 
         // Step 2.
         // Walking thru the links array
@@ -1836 +1828 @@
         // http://dummy-weblog.org/post.php
         // We don't wanna ping first and second types, even if they have a valid <link/>
 
-        foreach ( (array) $post_links_temp[0] as $link_test ) :
+        foreach ( (array) $post_links_temp as $link_test ) :
                 if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
                                 && !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
                         if ( $test = @parse_url($link_test) ) {

wordpress/wp-includes/functions.php

@@ -393 +393 @@
 }
 
 /**
+ * Use RegEx to extract URLs from arbitrary content
+ *
+ * @since 3.6.0
+ *
+ * @param string $content
+ * @return array URLs found in passed string
+ */
+function wp_extract_urls( $content ) {
+        preg_match_all(
+                "#((?:[\w-]+://?|[\w\d]+[.])[^\s()<>]+[.](?:\([\w\d]+\)|(?:[^`!()\[\]{};:'\".,<>?«»“”‘’\s]|(?:[:]\d+)?/?)+))#",
+                $content,
+                $post_links
+        );
+
+        $post_links = array_unique( array_map( 'html_entity_decode', $post_links[0] ) );
+
+        return array_values( $post_links );
+}
+
+/**
  * Check content for video and audio links to add as enclosures.
  *
  * Will not add enclosures that have already been added and will
@@ -417 +437 @@
 
         $pung = get_enclosed( $post_ID );
 
-        $ltrs = '\w';
-        $gunk = '/#~:.?+=&%@!\-';
-        $punc = '.:?\-';
-        $any = $ltrs . $gunk . $punc;
-
-        preg_match_all( "{\b http : [$any] +? (?= [$punc] * [^$any] | $)}x", $content, $post_links_temp );
+        $post_links_temp = wp_extract_urls( $content );
 
         foreach ( $pung as $link_test ) {
-                if ( !in_array( $link_test, $post_links_temp[0] ) ) { // link no longer in post
+                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 ) . '%') );
                         foreach ( $mids as $mid )
                                 delete_metadata_by_mid( 'post', $mid );
                 }
         }
 
-        foreach ( (array) $post_links_temp[0] as $link_test ) {
+        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 )
@@ -1437 +1452 @@
 /**
  * Determine if a directory is writable.
  *
- * This function is used to work around certain ACL issues 
+ * This function is used to work around certain ACL issues
  * in PHP primarily affecting Windows Servers.
  *
  * @see win_is_writable()
@@ -1457 +1472 @@
 /**
  * Workaround for Windows bug in is_writable() function
  *
- * PHP has issues with Windows ACL's for determine if a 
+ * PHP has issues with Windows ACL's for determine if a
  * directory is writable or not, this works around them by
  * checking the ability to open files rather than relying
  * upon PHP to interprate the OS ACL.