From 767c3538b9f4aa2684429a7efea8f7728034c754 Mon Sep 17 00:00:00 2001 From: donncha Date: Thu, 5 Oct 2006 17:45:26 +0000 Subject: WP Merge to rev 4347 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@789 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/general-template.php | 102 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 95 insertions(+), 7 deletions(-) (limited to 'wp-includes/general-template.php') diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 2cb5c02..ab68a5d 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -40,7 +40,7 @@ function wp_register( $before = '
  • ', $after = '
  • ' ) { if ( ! is_user_logged_in() ) { if ( get_option('users_can_register') ) - $link = $before . '' . __('Register') . '' . $after; + $link = $before . '' . __('Register') . '' . $after; else $link = ''; } else { @@ -154,6 +154,7 @@ function wp_title($sep = '»', $display = true) { $category_name = get_query_var('category_name'); $author = get_query_var('author'); $author_name = get_query_var('author_name'); + $title = ''; // If there's a category if ( !empty($cat) ) { @@ -259,13 +260,17 @@ function single_month_title($prefix = '', $display = true ) { $my_month = $wp_locale->get_month($monthnum); } elseif ( !empty($m) ) { $my_year = substr($m, 0, 4); - $my_month = $wp_locale->get_month($m); + $my_month = $wp_locale->get_month(substr($m, 4, 2)); } - if ( !empty($my_month) && $display ) - echo $prefix . $my_month . $prefix . $my_year; - else - return $monthnum; + if ( empty($my_month) ) + return false; + + $result = $prefix . $my_month . $prefix . $my_year; + + if ( !$display ) + return $result; + echo $result; } @@ -772,7 +777,7 @@ function the_editor($content, $id = 'content', $prev_id = 'title') {