L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-80338' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Huong Nguyen
2024-02-22 11:17:52 +07:00
parent 3061024726 6f60461220
commit 40f501fb4e
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/moodle_url_test.php
+15
View File
@@ -50,6 +50,9 @@ class moodle_url_test extends \advanced_testcase {
$url = new \moodle_url('/index.php', null, 'test');
$this->assertSame($CFG->wwwroot.'/index.php#test', $url->out());
$url = new \moodle_url('/index.php', null, 'Long "Anchor"');
$this->assertSame($CFG->wwwroot . '/index.php#Long%20%22Anchor%22', $url->out());
$url = new \moodle_url('/index.php', array('id' => 2), 'test');
$this->assertSame($CFG->wwwroot.'/index.php?id=2#test', $url->out());
}
@@ -136,6 +139,18 @@ class moodle_url_test extends \advanced_testcase {
$this->assertSame($strurl, $url->out(false));
}
/**
* Test returning URL without parameters
*/
public function test_out_omit_querystring(): void {
global $CFG;
$url = new \moodle_url('/index.php', ['id' => 2], 'Long "Anchor"');
$this->assertSame($CFG->wwwroot . '/index.php', $url->out_omit_querystring());
$this->assertSame($CFG->wwwroot . '/index.php#Long%20%22Anchor%22', $url->out_omit_querystring(true));
}
public function test_compare_url() {
$url1 = new \moodle_url('index.php', array('var1' => 1, 'var2' => 2));
$url2 = new \moodle_url('index2.php', array('var1' => 1, 'var2' => 2, 'var3' => 3));
lib/weblib.php
+2 -2
View File
@@ -619,7 +619,7 @@ class moodle_url {
$uri .= '?' . $querystring;
}
if (!is_null($this->anchor)) {
$uri .= '#'.$this->anchor;
$uri .= '#' . rawurlencode($this->anchor);
}
return $uri;
@@ -639,7 +639,7 @@ class moodle_url {
$uri .= $this->port ? ':'.$this->port : '';
$uri .= $this->path ? $this->path : '';
if ($includeanchor and !is_null($this->anchor)) {
$uri .= '#' . $this->anchor;
$uri .= '#' . rawurlencode($this->anchor);
}
return $uri;