Changes from branches/3.1/wp-includes/link-template.php at r17583 to trunk/wp-includes/link-template.php at r18328
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/link-template.php
r17583 r18328 1580 1580 * @return string|null 1581 1581 */ 1582 function get_next_posts_link( $label = 'Next Page »', $max_page = 0 ) {1582 function get_next_posts_link( $label = null, $max_page = 0 ) { 1583 1583 global $paged, $wp_query; 1584 1584 … … 1590 1590 1591 1591 $nextpage = intval($paged) + 1; 1592 1593 if ( null === $label ) 1594 $label = __( 'Next Page »' ); 1592 1595 1593 1596 if ( !is_single() && ( $nextpage <= $max_page ) ) { … … 1606 1609 * @param int $max_page Optional. Max pages. 1607 1610 */ 1608 function next_posts_link( $label = 'Next Page »', $max_page = 0 ) {1611 function next_posts_link( $label = null, $max_page = 0 ) { 1609 1612 echo get_next_posts_link( $label, $max_page ); 1610 1613 } … … 1656 1659 * @return string|null 1657 1660 */ 1658 function get_previous_posts_link( $label = '« Previous Page') {1661 function get_previous_posts_link( $label = null ) { 1659 1662 global $paged; 1663 1664 if ( null === $label ) 1665 $label = __( '« Previous Page' ); 1660 1666 1661 1667 if ( !is_single() && $paged > 1 ) { … … 1673 1679 * @param string $label Optional. Previous page link text. 1674 1680 */ 1675 function previous_posts_link( $label = '« Previous Page') {1681 function previous_posts_link( $label = null ) { 1676 1682 echo get_previous_posts_link( $label ); 1677 1683 } … … 2297 2303 2298 2304 $blogs = get_blogs_of_user( $user_id ); 2299 if ( empty($blogs) ) {2305 if ( ! is_super_admin() && empty($blogs) ) { 2300 2306 $url = user_admin_url( $path, $scheme ); 2301 2307 } elseif ( ! is_multisite() ) { … … 2303 2309 } else { 2304 2310 $current_blog = get_current_blog_id(); 2305 if ( $current_blog && in_array($current_blog, array_keys($blogs)) ) {2311 if ( $current_blog && ( is_super_admin( $user_id ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) { 2306 2312 $url = admin_url( $path, $scheme ); 2307 2313 } else {
Note: See TracChangeset
for help on using the changeset viewer.