From 374cfa11b43ca7001725d25d10fd52dfd67cfc6d Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 18 Nov 2010 23:07:59 +0000 Subject: [PATCH] Link to edit profile screen within same admin if in network or user admin. git-svn-id: http://svn.automattic.com/wordpress/trunk@16475 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/link-template.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index cfcdfd2ab..daccfb486 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -2319,7 +2319,12 @@ function get_dashboard_url( $user_id, $path = '', $scheme = 'admin' ) { function get_edit_profile_url( $user, $scheme = 'admin' ) { $user = (int) $user; - $url = get_dashboard_url( $user, 'profile.php', $scheme ); + 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 ); return apply_filters( 'edit_profile_url', $url, $user, $scheme); }