Merge branch 'MDL-68334-master' of git://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 03:05:54 +0000 (11:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 03:05:54 +0000 (11:05 +0800)
1  2 
lib/outputrenderers.php

diff --combined lib/outputrenderers.php
@@@ -1053,7 -1053,7 +1053,7 @@@ class core_renderer extends renderer_ba
          $course = $this->page->course;
          if (\core\session\manager::is_loggedinas()) {
              $realuser = \core\session\manager::get_realuser();
-             $fullname = fullname($realuser, true);
+             $fullname = fullname($realuser);
              if ($withlinks) {
                  $loginastitle = get_string('loginas');
                  $realuserinfo = " [<a href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&amp;sesskey=".sesskey()."\"";
          } else if (isloggedin()) {
              $context = context_course::instance($course->id);
  
-             $fullname = fullname($USER, true);
+             $fullname = fullname($USER);
              // Since Moodle 2.0 this link always goes to the public profile page (not the course profile page)
              if ($withlinks) {
                  $linktitle = get_string('viewprofile');
       */
      public function blocks_for_region($region) {
          $blockcontents = $this->page->blocks->get_content_for_region($region, $this);
 -        $blocks = $this->page->blocks->get_blocks_for_region($region);
          $lastblock = null;
          $zones = array();
 -        foreach ($blocks as $block) {
 -            $zones[] = $block->title;
 +        foreach ($blockcontents as $bc) {
 +            if ($bc instanceof block_contents) {
 +                $zones[] = $bc->title;
 +            }
          }
          $output = '';