Merge branch 'MDL-64119-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 22 Nov 2018 01:52:56 +0000 (09:52 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 22 Nov 2018 01:52:56 +0000 (09:52 +0800)
lib/outputrenderers.php
lib/tablelib.php

index 5e60efd..21787cd 100644 (file)
@@ -2575,10 +2575,10 @@ class core_renderer extends renderer_base {
      * @return string
      */
     protected function render_user_picture(user_picture $userpicture) {
-        global $CFG, $DB;
+        global $CFG, $DB, $PAGE;
 
         $user = $userpicture->user;
-        $canviewfullnames = has_capability('moodle/site:viewfullnames', context_system::instance());
+        $canviewfullnames = has_capability('moodle/site:viewfullnames', $PAGE->context);
 
         if ($userpicture->alttext) {
             if (!empty($user->imagealt)) {
index a35a49a..4405bc6 100644 (file)
@@ -1200,7 +1200,7 @@ class flexible_table {
      * This function is not part of the public api.
      */
     function print_headers() {
-        global $CFG, $OUTPUT;
+        global $CFG, $OUTPUT, $PAGE;
 
         echo html_writer::start_tag('thead');
         echo html_writer::start_tag('tr');
@@ -1222,7 +1222,7 @@ class flexible_table {
 
                 case 'fullname':
                     // Check the full name display for sortable fields.
-                    if (has_capability('moodle/site:viewfullnames', context_system::instance())) {
+                    if (has_capability('moodle/site:viewfullnames', $PAGE->context)) {
                         $nameformat = $CFG->alternativefullnameformat;
                     } else {
                         $nameformat = $CFG->fullnamedisplay;