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

2011-07-25 11:03:52 +08:00
parent dbb6d73c8c 1e075c08a0
commit 18c2fcf8f1
1 changed files with 6 additions and 0 deletions
@@ -501,6 +501,12 @@ function get_exception_info($ex) {
        }
    }

+    // 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.'/';
+    }
+
    $info = new stdClass();
    $info->message     = $message;
    $info->errorcode   = $errorcode;