Changeset 23792

Timestamp:

03/22/2013 10:42:37 PM (14 years ago)

Author:

lancewillett

Message:

Twenty Eleven: use new URL extraction function, get_the_url() for link post formats in the Ephemera widget. Props obenland, fixes #23618.

Location:

trunk/wp-content/themes/twentyeleven

Files:

• functions.php (modified) (2 diffs)
• inc/widgets.php (modified) (1 diff)

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

@@ -459 +459 @@
 endif; // twentyeleven_content_nav
 
-if ( ! function_exists( 'twentyeleven_url_grabber' ) ) :
+/**
+ * Return the first link from the post content. If none found, the
+ * post permalink is used as a fallback.
+ *
+ * @return string
+ */
+function twentyeleven_get_first_url() {
+        $has_url = function_exists( 'get_the_url' ) ? get_the_url() : false;
+
+        if ( ! $has_url )
+                $has_url = twentyeleven_url_grabber();
+
+        return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
+}
+
 /**
  * Return the URL for the first link found in the post content.
@@ -472 +486 @@
         return esc_url_raw( $matches[1] );
 }
-endif;
 
 /**

trunk/wp-content/themes/twentyeleven/inc/widgets.php

@@ -96 +96 @@
 
                                 <li class="widget-entry-title">
-                                        <?php
-                                                // Grab first link from the post content. If none found, use the post permalink as fallback.
-                                                $link_url = twentyeleven_url_grabber();
-
-                                                if ( empty( $link_url ) )
-                                                        $link_url = get_permalink();
-                                        ?>
-                                        <a href="<?php echo esc_url( $link_url ); ?>" title="<?php echo esc_attr( sprintf( __( 'Link to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
+                                        <a href="<?php echo esc_url( twentyeleven_get_first_url() ); ?>" title="<?php echo esc_attr( sprintf( __( 'Link to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
                                         <span class="comments-link">
                                                 <?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>