Ticket #16686: 16686.2.diff

wp-admin/admin-header.php

@@ -153 +153 @@
         if ( !is_network_admin() )
                 $links[10] = '| <a href="' . network_admin_url() . '" title="' . ( ! empty( $update_title ) ? $update_title : esc_attr__('Network Admin') ) . '">' . __('Network Admin') . ( ! empty( $total_update_count ) ? ' (' . number_format_i18n( $total_update_count ) . ')' : '' ) . '</a>';
         else
-                $links[10] = '| <a href="' . get_dashboard_url( get_current_user_id() ) . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
+                $links[10] = '| <a href="' . get_dashboard_url() . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
 }
 $links[15] = '| <a href="' . wp_logout_url() . '" title="' . esc_attr__('Log Out') . '">' . __('Log Out') . '</a>';
 

wp-includes/link-template.php

@@ -2290 +2290 @@
  * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard url link with optional path appended
  */
-function get_dashboard_url( $user_id, $path = '', $scheme = 'admin' ) {
-        $user_id = (int) $user_id;
+function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
+        $user_id = ( $user_id ) ? (int) $user_id : get_current_user_id();
 
         $blogs = get_blogs_of_user( $user_id );
         if ( empty($blogs) ) {
@@ -2319 +2319 @@
  *
  * @since 3.1.0
  *
- * @param int $user User ID
+ * @param int $user_id User ID
  * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard url link with optional path appended
  */
-function get_edit_profile_url( $user, $scheme = 'admin' ) {
-        $user = (int) $user;
+function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
+        $user_id = ( $user_id ) ? (int) $user_id : get_current_user_id();
 
         if ( is_user_admin() )
                 $url = user_admin_url( 'profile.php', $scheme );
         elseif ( is_network_admin() )
                 $url = network_admin_url( 'profile.php', $scheme );
         else
-                $url = get_dashboard_url( $user, 'profile.php', $scheme );
+                $url = get_dashboard_url( $user_id, 'profile.php', $scheme );
 
-        return apply_filters( 'edit_profile_url', $url, $user, $scheme);
+        return apply_filters( 'edit_profile_url', $url, $user_id, $scheme);
 }
 
 /**