mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

MDL-10296 made print_user_picture cater for https possibility in user/edit

Browse Source
This commit is contained in:
jmg324 2007-09-20 09:18:24 +00:00
parent 05a71b3341
commit 874851f610
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/weblib.php
View File

@ -3768,7 +3768,11 @@ function print_user_picture($user, $courseid, $picture=NULL, $size=0, $return=fa
$file = 'f2';
}
$class = "userpicture";
if (!empty($HTTPSPAGEREQUIRED)) {
$wwwroot = $CFG->httpswwwroot;
} else {
$wwwroot = $CFG->wwwroot;
}
if (is_null($picture)) {
$picture = $user->picture;
@ -3776,9 +3780,9 @@ function print_user_picture($user, $courseid, $picture=NULL, $size=0, $return=fa
if ($picture) { // Print custom user picture
if ($CFG->slasharguments) { // Use this method if possible for better caching
$src = $CFG->wwwroot .'/user/pix.php/'. $user->id .'/'. $file .'.jpg';
$src = $wwwroot .'/user/pix.php/'. $user->id .'/'. $file .'.jpg';
} else {
$src = $CFG->wwwroot .'/user/pix.php?file=/'. $user->id .'/'. $file .'.jpg';
$src = $wwwroot .'/user/pix.php?file=/'. $user->id .'/'. $file .'.jpg';
}
} else { // Print default user pictures (use theme version if available)
$class .= " defaultuserpic";