Changeset 24682 for trunk/wp-includes/post-formats.php

Timestamp:

07/12/2013 07:34:59 PM (12 years ago)

Author:

nacin

Message:

Simplify and reduce the new media/content extraction functions.

The URL extraction function is now get_url_in_content(). For more, see #24202.

Also adds filters to get_post_galleries() and get_post_gallery(). fixes #24309.

File:

• trunk/wp-includes/post-formats.php (modified) (2 diffs)

trunk/wp-includes/post-formats.php

@@ -236 +236 @@
 
 /**
- * Extract a URL from passed content, if possible
- * Checks for a URL on the first line of the content or the first encountered href attribute.
+ * Extract and return the first URL from passed content.
  *
  * @since 3.6.0
@@ -244 +243 @@
  * @return string The found URL.
  */
-function get_content_url( $content ) {
+function get_url_in_content( $content ) {
     if ( empty( $content ) )
         return '';
 
-    // the content is a URL
-    $trimmed = trim( $content );
-    if ( 0 === stripos( $trimmed, 'http' ) && ! preg_match( '#\s#', $trimmed ) ) {
-        return $trimmed;
-
-    // the content is HTML so we grab the first href
-    } elseif ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
+    if ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) )
         return esc_url_raw( $matches[2] );
-    }
-
-    $lines = explode( "\n", $trimmed );
-    $line = trim( array_shift( $lines ) );
-
-    // the content is a URL followed by content
-    if ( 0 === stripos( $line, 'http' ) )
-        return esc_url_raw( $line );
-
-    return '';
+
+    return false;
 }