Changes from trunk/wp-includes/link-template.php at r18328 to branches/3.1/wp-includes/link-template.php at r17583

File:

• branches/3.1/wp-includes/link-template.php (modified) (7 diffs)

branches/3.1/wp-includes/link-template.php

@@ -1580 +1580 @@
  * @return string|null
  */
-function get_next_posts_link( $label = null, $max_page = 0 ) {
+function get_next_posts_link( $label = 'Next Page »', $max_page = 0 ) {
     global $paged, $wp_query;
 
@@ -1590 +1590 @@
 
     $nextpage = intval($paged) + 1;
-
-    if ( null === $label )
-        $label = __( 'Next Page »' );
 
     if ( !is_single() && ( $nextpage <= $max_page ) ) {
@@ -1609 +1606 @@
  * @param int $max_page Optional. Max pages.
  */
-function next_posts_link( $label = null, $max_page = 0 ) {
+function next_posts_link( $label = 'Next Page &raquo;', $max_page = 0 ) {
     echo get_next_posts_link( $label, $max_page );
 }
@@ -1659 +1656 @@
  * @return string|null
  */
-function get_previous_posts_link( $label = null ) {
+function get_previous_posts_link( $label = '&laquo; Previous Page' ) {
     global $paged;
-
-    if ( null === $label )
-        $label = __( '&laquo; Previous Page' );
 
     if ( !is_single() && $paged > 1 ) {
@@ -1679 +1673 @@
  * @param string $label Optional. Previous page link text.
  */
-function previous_posts_link( $label = null ) {
+function previous_posts_link( $label = '&laquo; Previous Page' ) {
     echo get_previous_posts_link( $label );
 }
@@ -2303 +2297 @@
 
     $blogs = get_blogs_of_user( $user_id );
-    if ( ! is_super_admin() && empty($blogs) ) {
+    if ( empty($blogs) ) {
         $url = user_admin_url( $path, $scheme );
     } elseif ( ! is_multisite() ) {
@@ -2309 +2303 @@
     } else {
         $current_blog = get_current_blog_id();
-        if ( $current_blog  && ( is_super_admin( $user_id ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
+        if ( $current_blog  && in_array($current_blog, array_keys($blogs)) ) {
             $url = admin_url( $path, $scheme );
         } else {