Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'w29_MDL-27464_m19_continue' of git://github.com/skodak/…

…moodle into MOODLE_19_STABLE
  • Loading branch information...
commit e41831dde45dc38eabc96535c0bc528e98f4ee71 2 parents fb50bf6 + 8f9f666
@samhemelryk samhemelryk authored
Showing with 12 additions and 0 deletions.
  1. +6 −0 lib/deprecatedlib.php
  2. +6 −0 lib/weblib.php
View
6 lib/deprecatedlib.php
@@ -1677,6 +1677,12 @@ function error ($message, $link='') {
}
}
+ // when printing an error the continue button should never link offsite
+ if (stripos($link, $CFG->wwwroot) === false &&
+ stripos($link, $CFG->httpswwwroot) === false) {
+ $link = $CFG->wwwroot.'/';
+ }
+
if (!empty($link)) {
print_continue($link);
}
View
6 lib/weblib.php
@@ -5841,6 +5841,12 @@ function print_error($errorcode, $module='error', $link='', $a=NULL, $extralocat
}
}
+ // when printing an error the continue button should never link offsite
+ if (stripos($link, $CFG->wwwroot) === false &&
+ stripos($link, $CFG->httpswwwroot) === false) {
+ $link = $CFG->wwwroot.'/';
+ }
+
if (!empty($CFG->errordocroot)) {
$errordoclink = $CFG->errordocroot.'/en';
} else {
Please sign in to comment.
Something went wrong with that request. Please try again.