From 1ba3293a6bb834bae9f57380fed73742eba2ee0c Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Tue, 11 Nov 2008 19:06:20 +0000
Subject: [PATCH] MDL-17143 Some improvements suggested by Petr applied. Merged
 from 19_STABLE

---
 user/edit_form.php         | 2 +-
 user/editadvanced_form.php | 2 +-
 user/view.php              | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/user/edit_form.php b/user/edit_form.php
index ca9a7bc4f2..a54cc7775c 100644
--- 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 b4a4b151bf..85db6614bc 100644
--- 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 b41ebf9550..6604abda12 100644
--- 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 />";
-- 
2.39.5