MDL-17143 Avoid notices caused by not existing profilesforenrolledusersonly setting...

diff --git a/user/edit_form.php b/user/edit_form.php
index 920ec7edcfdde21d528a0ac58d42c3da955ca8e5..ca9a7bc4f261cf4a917a678d8f4e496bb38ca204 100644 (file)
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -64,7 +64,7 @@ class user_edit_form extends moodleform {
         if ($user = $DB->get_record('user', array('id'=>$userid))) {
 
             // remove description
-            if (!$DB->get_record('role_assignments', array('userid'=>$userid)) && empty($user->description) && $CFG->profilesforenrolledusersonly) {
+            if (!$DB->get_record('role_assignments', array('userid'=>$userid)) && empty($user->description) && !empty($CFG->profilesforenrolledusersonly)) {
                 $mform->removeElement('description');
             }
 

diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index 03b3c627c4a6674ea47088a14cb43046a806f86a..b4a4b151bf5f22df6df027b5a7b12d3a9fdb932c 100644 (file)
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -78,7 +78,7 @@ class user_editadvanced_form extends moodleform {
         $sitecontext = get_context_instance(CONTEXT_SYSTEM);
         $can_edit_user = has_capability('moodle/user:update', $sitecontext);
         // remove description
-        if (!$DB->get_record('role_assignments', array('userid'=>$userid)) && empty($user->description) && $CFG->profilesforenrolledusersonly && !$can_edit_user) {
+        if (!$DB->get_record('role_assignments', array('userid'=>$userid)) && empty($user->description) && !empty($CFG->profilesforenrolledusersonly) && !$can_edit_user) {
             $mform->removeElement('description');
         }
 

diff --git a/user/view.php b/user/view.php
index 74a37d5fefb749df40e519b777f75fce0ebef30d..b41ebf95508434174f97e0af82cf7be4a0bcffac 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -212,7 +212,7 @@
     if ($user->description && !isset($hiddenfields['description'])) {
         $has_courseid = ($course->id != SITEID);
         if (!$DB->get_record('role_assignments', array('userid'=>$id))
-            && !$has_courseid && $CFG->profilesforenrolledusersonly) {
+            && !$has_courseid && !empty($CFG->profilesforenrolledusersonly)) {
             echo get_string('profilenotshown', 'moodle').'<hr />';
         } else {
             echo format_text($user->description, FORMAT_MOODLE)."<hr />";