From 55cab152a47c72331162d64db229e306aa6b4121 Mon Sep 17 00:00:00 2001
From: Jerome Mouneyrac <jerome@moodle.com>
Date: Wed, 26 Sep 2012 14:24:29 +0800
Subject: [PATCH] MDL-35644 user_get_details: admin should be able to see
 description

Conflicts:

	user/lib.php
---
 user/lib.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/user/lib.php b/user/lib.php
index 6b6f59ed571..1aef0f74d57 100644
--- a/user/lib.php
+++ b/user/lib.php
@@ -296,16 +296,15 @@ function user_get_user_details($user, $course = null, array $userfields = array(
         $userdetails['phone2'] = $user->phone2;
     }
 
-    if (isset($user->description) && (!isset($hiddenfields['description']) or $isadmin)) {
-        if (!$cannotviewdescription) {
+    if (isset($user->description) &&
+        ((!isset($hiddenfields['description']) && !$cannotviewdescription) or $isadmin)) {
 
-            if (in_array('description', $userfields)) {
-                $user->description = file_rewrite_pluginfile_urls($user->description, 'pluginfile.php', $usercontext->id, 'user', 'profile', null);
-                $userdetails['description'] = $user->description;
-            }
-            if (in_array('descriptionformat', $userfields)) {
-                $userdetails['descriptionformat'] = $user->descriptionformat;
-            }
+        if (in_array('description', $userfields)) {
+            $user->description = file_rewrite_pluginfile_urls($user->description, 'pluginfile.php', $usercontext->id, 'user', 'profile', null);
+            $userdetails['description'] = $user->description;
+        }
+        if (in_array('descriptionformat', $userfields)) {
+            $userdetails['descriptionformat'] = $user->descriptionformat;
         }
     }