Changeset 24554

Timestamp:

07/03/2013 10:36:13 PM (11 years ago)

Author:

ocean90

Message:

Lose content removal and splitting from get_content_url(). And remove unneeded lines from [24400].

fixes #24484.

Location:

trunk/wp-includes

Files:

• media.php (modified) (3 diffs)
• post-formats.php (modified) (3 diffs)

trunk/wp-includes/media.php

@@ -2425 +2425 @@
                             if ( ! $matched )
                                 $matched = do_shortcode_tag( $shortcode );
-                            // $content = str_replace( $shortcode[0], '', $content, $count );
                         }
                     }
@@ -2439 +2438 @@
                             if ( ! $matched )
                                 $matched = $match[0];
-                            // $content = str_replace( $match[0], '', $content, $count );
                         }
                     }
@@ -2506 +2504 @@
         return $attachment_id;
 
-    $classes = $matches[2]; 
-    if ( ! empty( $classes ) && false !== strpos( $classes, 'wp-image-' ) ) 
-        if ( preg_match( '#wp-image-([0-9]+)#i', $classes, $matches ) ) 
+    $classes = $matches[2];
+    if ( ! empty( $classes ) && false !== strpos( $classes, 'wp-image-' ) )
+        if ( preg_match( '#wp-image-([0-9]+)#i', $classes, $matches ) )
             $attachment_id = absint( $matches[1] );
 

trunk/wp-includes/post-formats.php

@@ -241 +241 @@
  * @since 3.6.0
  *
- * @param string $content A string which might contain a URL, passed by reference.
- * @param boolean $remove Whether to remove the found URL from the passed content.
+ * @param string $content A string which might contain a URL.
  * @return string The found URL.
  */
-function get_content_url( &$content, $remove = false ) {
+function get_content_url( $content ) {
     if ( empty( $content ) )
         return '';
@@ -252 +251 @@
     $trimmed = trim( $content );
     if ( 0 === stripos( $trimmed, 'http' ) && ! preg_match( '#\s#', $trimmed ) ) {
-        if ( $remove )
-            $content = '';
-
         return $trimmed;
+
     // the content is HTML so we grab the first href
     } elseif ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
@@ -265 +262 @@
 
     // the content is a URL followed by content
-    if ( 0 === stripos( $line, 'http' ) ) {
-        if ( $remove )
-            $content = trim( join( "\n", $lines ) );
-
+    if ( 0 === stripos( $line, 'http' ) )
         return esc_url_raw( $line );
-    }
 
     return '';