MDL-10296 made print_user_picture cater for https possibility in user/edit
This commit is contained in:
+8
-2
@@ -3338,11 +3338,17 @@ function print_user_picture($userid, $courseid, $picture, $size=0, $return=false
|
||||
$file = 'f2';
|
||||
}
|
||||
$class = "userpicture";
|
||||
if (!empty($HTTPSPAGEREQUIRED)) {
|
||||
$wwwroot = $CFG->httpswwwroot;
|
||||
} else {
|
||||
$wwwroot = $CFG->wwwroot;
|
||||
}
|
||||
|
||||
if ($picture) { // Print custom user picture
|
||||
if ($CFG->slasharguments) { // Use this method if possible for better caching
|
||||
$src = $CFG->wwwroot .'/user/pix.php/'. $userid .'/'. $file .'.jpg';
|
||||
$src = $wwwroot .'/user/pix.php/'. $userid .'/'. $file .'.jpg';
|
||||
} else {
|
||||
$src = $CFG->wwwroot .'/user/pix.php?file=/'. $userid .'/'. $file .'.jpg';
|
||||
$src = $wwwroot .'/user/pix.php?file=/'. $userid .'/'. $file .'.jpg';
|
||||
}
|
||||
} else { // Print default user pictures (use theme version if available)
|
||||
$class .= " defaultuserpic";
|
||||
|
||||
Reference in New Issue
Block a user