From 372a768ebc5846e98e69d6612db7f8bac6f4f9de Mon Sep 17 00:00:00 2001 From: Ben Word Date: Fri, 5 Aug 2011 00:05:49 -0600 Subject: [PATCH] further cleanup --- inc/roots-cleanup.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/inc/roots-cleanup.php b/inc/roots-cleanup.php index e8adb3c..c8c34b3 100644 --- a/inc/roots-cleanup.php +++ b/inc/roots-cleanup.php @@ -104,12 +104,12 @@ function roots_noindex() { function roots_rel_canonical() { if (!is_singular()) { return; - } + } global $wp_the_query; if (!$id = $wp_the_query->get_queried_object_id()) { return; - } + } $link = get_permalink($id); echo "\t\n"; @@ -283,16 +283,12 @@ function roots_excerpt_length($length) { return 40; } -function roots_continue_reading_link() { - return ' ' . __( 'Continued', 'roots' ) . ''; -} - -function roots_auto_excerpt_more($more) { - return ' …' . roots_continue_reading_link(); +function roots_excerpt_more($more) { + return ' … ' . __( 'Continued', 'roots' ) . ''; } add_filter('excerpt_length', 'roots_excerpt_length'); -add_filter('excerpt_more', 'roots_auto_excerpt_more'); +add_filter('excerpt_more', 'roots_excerpt_more'); // remove container from menus function roots_nav_menu_args($args = '') {