Merge branch 'w29_MDL-27464_m19_continue' of git://github.com/skodak/moodle into MOODLE_19_STABLE

2011-07-25 11:04:13 +08:00
parent fb50bf6c32 8f9f666c90
commit e41831dde4
2 changed files with 12 additions and 0 deletions
@@ -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);
    }
@@ -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 {