Merge branch 'MDL-69474' of https://github.com/stronk7/moodle

rboyatt · Mar 16, 2021 · ab8b390 · ab8b390
2 parents c862a09 + f35e3f0
commit ab8b390
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -2579,12 +2579,8 @@ protected function render_user_picture(user_picture $userpicture) {
         }
 
         // Then wrap it in link if needed. Also we don't wrap it in link if the link redirects to itself.
-        // It might not return page url in unit test.
-        if (PHPUNIT_TEST) {
-            if (!$userpicture->link ) {
-                return $output;
-            }
-        } else if (!$userpicture->link || $this->page->url == $url) {
+        if (!$userpicture->link ||
+                ($this->page->has_set_url() && $this->page->url == $url)) { // Protect against unset page->url.
             return $output;
         }