Changeset 23787

Timestamp:

03/22/2013 06:57:50 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: use new get_the_url() function to find first link in a "Link" post format post. See #23619, props Frank Klein for the original patch.

File:

• trunk/wp-content/themes/twentythirteen/functions.php (modified) (2 diffs)

trunk/wp-content/themes/twentythirteen/functions.php

@@ -422 +422 @@
 if ( ! function_exists( 'twentythirteen_get_first_url' ) ) :
 /**
- * Return the URL for the first link in the post content or the permalink if no
- * URL is found.
+ * Returns the URL from the post.
+ *
+ * @uses get_the_link() to get the URL in the post meta (if it exists) or
+ * the first link found in the post content.
+ *
+ * Falls back to the post permalink if no URL is found in the post.
  *
  * @since Twenty Thirteen 1.0
@@ -429 +433 @@
  */
 function twentythirteen_get_first_url() {
-    $has_url = preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $match );
-    $link    = ( $has_url ) ? $match[1] : apply_filters( 'the_permalink', get_permalink() );
-
-    return esc_url_raw( $link );
+    $has_url = get_the_url();
+
+    return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
 }
 endif;