mirror of
https://github.com/moodle/moodle.git
synced 2025-03-09 10:19:56 +01:00
Merge branch 'w07_MDL-26322_20_wantsurl' of git://github.com/skodak/moodle
This commit is contained in:
commit
b60f77ca29
@ -182,7 +182,7 @@ if ($frm and isset($frm->username)) { // Login WITH
|
||||
$urltogo = $CFG->wwwroot.'/user/edit.php';
|
||||
// We don't delete $SESSION->wantsurl yet, so we get there later
|
||||
|
||||
} else if (isset($SESSION->wantsurl) and (strpos($SESSION->wantsurl, $CFG->wwwroot) === 0)) {
|
||||
} else if (isset($SESSION->wantsurl) and (strpos($SESSION->wantsurl, $CFG->wwwroot) === 0 or strpos($SESSION->wantsurl, str_replace('http://', 'https://', $CFG->wwwroot)) === 0)) {
|
||||
$urltogo = $SESSION->wantsurl; /// Because it's an address in this site
|
||||
unset($SESSION->wantsurl);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user