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

MDL-21210 hopefully fixed $PAGE->set_url() weirdness and added more diagnostics

Browse Source
This commit is contained in:
Petr Skoda
2009-12-29 14:30:15 +00:00
parent b195b44339
commit 42174e18fb
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pagelib.php
+17 -5
View File
@@ -818,16 +818,28 @@ class moodle_page {
*/
public function set_url($url, $params = array()) {
global $CFG;
if ($url instanceof moodle_url) {
$shorturl = str_replace($CFG->wwwroot . '/', '', $url->out(true));
$this->_url = clone($url);
if (!empty($params)) {
throw new coding_exception('Cannot pass params together with moodle_url to moodle_page::set_url().');
}
} else {
$shorturl = $url;
$this->_url = new moodle_url($CFG->wwwroot . '/' . $url, $params);
$this->_url = clone($url);
} else if (is_string($url)) {
if (strpos($url, 'http') === 0) {
$this->_url = new moodle_url($url, $params);
} else {
// we have to use httpswwwroot here, because of loginhttps pages
$this->_url = new moodle_url($CFG->httpswwwroot . '/' . $url, $params);
}
}
$fullurl = $this->_url->out(true);
if (strpos($fullurl, "$CFG->httpswwwroot/") !== 0) {
debugging('Most probably incorrect set_page() url argument, it does not match the httpswwwroot!');
}
$shorturl = str_replace("$CFG->httpswwwroot/", '', $fullurl);
if (is_null($this->_pagetype)) {
$this->initialise_default_pagetype($shorturl);
}