Wordpress 3.2

[autoinstalls/wordpress.git] / wp-includes / link-template.php

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 434d2217a9ddb2f4eed5c599cd516316afc07bea..70f7595670f4767b2490777e72a3297722c16c8e 100644 (file)
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -1579,7 +1579,7 @@ function next_posts( $max_page = 0, $echo = true ) {
  * @param int $max_page Optional. Max pages.
  * @return string|null
  */
-function get_next_posts_link( $label = 'Next Page »', $max_page = 0 ) {
+function get_next_posts_link( $label = null, $max_page = 0 ) {
        global $paged, $wp_query;
 
        if ( !$max_page )
@@ -1590,6 +1590,9 @@ function get_next_posts_link( $label = 'Next Page »', $max_page = 0 ) {
 
        $nextpage = intval($paged) + 1;
 
+       if ( null === $label )
+               $label = __( 'Next Page »' );
+
        if ( !is_single() && ( $nextpage <= $max_page ) ) {
                $attr = apply_filters( 'next_posts_link_attributes', '' );
                return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) . '</a>';
@@ -1605,7 +1608,7 @@ function get_next_posts_link( $label = 'Next Page &raquo;', $max_page = 0 ) {
  * @param string $label Content for link text.
  * @param int $max_page Optional. Max pages.
  */
-function next_posts_link( $label = 'Next Page &raquo;', $max_page = 0 ) {
+function next_posts_link( $label = null, $max_page = 0 ) {
        echo get_next_posts_link( $label, $max_page );
 }
 
@@ -1655,9 +1658,12 @@ function previous_posts( $echo = true ) {
  * @param string $label Optional. Previous page link text.
  * @return string|null
  */
-function get_previous_posts_link( $label = '&laquo; Previous Page' ) {
+function get_previous_posts_link( $label = null ) {
        global $paged;
 
+       if ( null === $label )
+               $label = __( '&laquo; Previous Page' );
+
        if ( !is_single() && $paged > 1 ) {
                $attr = apply_filters( 'previous_posts_link_attributes', '' );
                return '<a href="' . previous_posts( false ) . "\" $attr>". preg_replace( '/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label ) .'</a>';
@@ -1672,7 +1678,7 @@ function get_previous_posts_link( $label = '&laquo; Previous Page' ) {
  *
  * @param string $label Optional. Previous page link text.
  */
-function previous_posts_link( $label = '&laquo; Previous Page' ) {
+function previous_posts_link( $label = null ) {
        echo get_previous_posts_link( $label );
 }
 
@@ -2296,13 +2302,13 @@ function get_dashboard_url( $user_id, $path = '', $scheme = 'admin' ) {
        $user_id = (int) $user_id;
 
        $blogs = get_blogs_of_user( $user_id );
-       if ( empty($blogs) ) {
+       if ( ! is_super_admin() && empty($blogs) ) {
                $url = user_admin_url( $path, $scheme );
        } elseif ( ! is_multisite() ) {
                $url = admin_url( $path, $scheme );
        } else {
                $current_blog = get_current_blog_id();
-               if ( $current_blog  && in_array($current_blog, array_keys($blogs)) ) {
+               if ( $current_blog  && ( is_super_admin( $user_id ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
                        $url = admin_url( $path, $scheme );
                } else {
                        $active = get_active_blog_for_user( $user_id );