MDL-17228 Allow admins to view hidden custom profile fields.

Thanks to Alan Barrett for the fix. Merged from MOODLE_19_STABLE

diff --git a/user/profile/lib.php b/user/profile/lib.php
index 6642d0c12c5ced0f7f2823f7665ad9ad10f3c0ad..fc4819d7dbb9f292e1f61f80ae794c873cbe3d87 100644 (file)
--- a/user/profile/lib.php
+++ b/user/profile/lib.php
@@ -242,7 +242,11 @@ class profile_field_base {
             case PROFILE_VISIBLE_ALL:
                 return true;
             case PROFILE_VISIBLE_PRIVATE:
-                return ($this->userid == $USER->id);
+                if ($this->userid == $USER->id) {
+                    return true;
+                } else {
+                    return has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM));
+                }
             default:
                 return has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM));
         }