mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-69474 accessibility: page->url can be not set, protect against that

Browse Source 
Both in unit tests, but also in other areas (say blocks, for example)
it's possible that page->url has not been set yet.

So, let's change current code to always check if we have something
(page->url) to compare.

Note the use of has_set_url() is needed, because page->url is magic
method and it doesn't work as expected. Hate magics!
This commit is contained in:
Eloy Lafuente (stronk7) 2021-03-15 20:20:33 +01:00
parent 695f75373b
commit f35e3f09c2
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/outputrenderers.php
View File

@ -2579,12 +2579,8 @@ class core_renderer extends renderer_base {
}
// 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;
}