MDL-17143 Some improvements suggested by Petr applied. Merged from 19_STABLE

diff --git a/user/edit_form.php b/user/edit_form.php
index ca9a7bc4f261cf4a917a678d8f4e496bb38ca204..a54cc7775c79b892e8d792e973a4e8b7f2e25fd5 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) && !empty($CFG->profilesforenrolledusersonly)) {
+            if (empty($user->description) && !empty($CFG->profilesforenrolledusersonly) && !$DB->get_record('role_assignments', array('userid'=>$userid))) {
                 $mform->removeElement('description');
             }
 

diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index b4a4b151bf5f22df6df027b5a7b12d3a9fdb932c..85db6614bc7a37aae486fe8b8f47680e8d3d1d6c 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) && !empty($CFG->profilesforenrolledusersonly) && !$can_edit_user) {
+        if (empty($user->description) && !empty($CFG->profilesforenrolledusersonly) && !$can_edit_user && !$DB->get_record('role_assignments', array('userid'=>$userid))) {
             $mform->removeElement('description');
         }
 

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