From ed9e0cb6ecd968348270a24ab41caa9da1a3055c Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 20 Sep 2011 11:07:17 +0200 Subject: [PATCH] MDL-21676 user: minor gravatar fixes --- user/edit_form.php | 2 +- user/editadvanced_form.php | 2 +- user/editlib.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user/edit_form.php b/user/edit_form.php index e0290896307..2fdfe1e596e 100644 --- a/user/edit_form.php +++ b/user/edit_form.php @@ -75,7 +75,7 @@ class user_edit_form extends moodleform { if (!empty($CFG->gdversion)) { $context = get_context_instance(CONTEXT_USER, $user->id, MUST_EXIST); $fs = get_file_storage(); - $hasuploadedpicture = (!$fs->file_exists($context->id, 'user', 'icon', 0, '/', 'f2.png') && !$fs->file_exists($context->id, 'user', 'icon', 0, '/', 'f2.jpg')); + $hasuploadedpicture = ($fs->file_exists($context->id, 'user', 'icon', 0, '/', 'f2.png') || $fs->file_exists($context->id, 'user', 'icon', 0, '/', 'f2.jpg')); if (!empty($user->picture) && $hasuploadedpicture) { $imagevalue = $OUTPUT->user_picture($user, array('courseid' => SITEID, 'size'=>64)); } else { diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php index 0beb65eff9c..742b3dd0fc6 100644 --- a/user/editadvanced_form.php +++ b/user/editadvanced_form.php @@ -104,7 +104,7 @@ class user_editadvanced_form extends moodleform { if ($user) { $context = get_context_instance(CONTEXT_USER, $user->id, MUST_EXIST); $fs = get_file_storage(); - $hasuploadedpicture = (!$fs->file_exists($context->id, 'user', 'icon', 0, '/', 'f2.png') && !$fs->file_exists($context->id, 'user', 'icon', 0, '/', 'f2.jpg')); + $hasuploadedpicture = ($fs->file_exists($context->id, 'user', 'icon', 0, '/', 'f2.png') || $fs->file_exists($context->id, 'user', 'icon', 0, '/', 'f2.jpg')); if (!empty($user->picture) && $hasuploadedpicture) { $imagevalue = $OUTPUT->user_picture($user, array('courseid' => SITEID, 'size'=>64)); } else { diff --git a/user/editlib.php b/user/editlib.php index 168b5f09a40..59228ecbc6c 100644 --- a/user/editlib.php +++ b/user/editlib.php @@ -263,7 +263,7 @@ function useredit_shared_definition(&$mform, $editoroptions = null) { $mform->addElement('header', 'moodle_picture', get_string('pictureofuser')); if (!empty($CFG->enablegravatar)) { - $mform->addElement('static', 'gravatarenabled', get_string('gravatarenabled')); + $mform->addElement('html', html_writer::tag('p', get_string('gravatarenabled'))); } $mform->addElement('static', 'currentpicture', get_string('currentpicture')); -- 2.17.1