Commit 585e1a03 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review

Merge "Checking for $user->urlid before trying to access it (bug #1253462)" into 1.6_STABLE

parents 10d10984 ff9142fc
......@@ -1609,7 +1609,8 @@ function profile_url($user, $full=true, $useid=false) {
}
else if (is_numeric($user)) {
$id = $user;
$urlid = $wantclean ? get_user_for_display($id)->urlid : null;
$user = get_user_for_display($id);
$urlid = ($wantclean && !empty($user->urlid)) ? $user->urlid : null;
}
else if (isset($user->id)) {
$id = $user->id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment