Commit 58d74fc4 authored by Francois Marier's avatar Francois Marier Committed by Gerrit Code Review
Browse files

Merge "Revert "Make profile_icon_url output compatible with html export...

Merge "Revert "Make profile_icon_url output compatible with html export filter." due to bug #806985"
parents a185ceed 7be4d2d1
...@@ -2038,10 +2038,10 @@ function profile_icon_url($user, $maxwidth=40, $maxheight=40) { ...@@ -2038,10 +2038,10 @@ function profile_icon_url($user, $maxwidth=40, $maxheight=40) {
} }
$thumb = get_config('wwwroot') . 'thumb.php'; $thumb = get_config('wwwroot') . 'thumb.php';
$sizeparams = 'maxwidth=' . $maxwidth . '&maxheight=' . $maxheight; $sizeparams = 'maxwidth=' . $maxwidth . '&maxheight=' . $maxheight;
if (!empty($user->profileicon)) { if (!empty($user->profileicon)) {
return $thumb . '?type=profileiconbyid&' . $sizeparams . '&id=' . $user->profileicon; return $thumb . '?type=profileiconbyid&' . $sizeparams . '&id=' . $user->profileicon;
} }
// Assume we have the right size available in docroot, so we don't // Assume we have the right size available in docroot, so we don't
......
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