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

…moodle into MOODLE_20_STABLE
moodle · Jul 25, 2011 · 417fdfa · 417fdfa
2 parents 77c9ae4 + 2011593
commit 417fdfa
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/setuplib.php b/lib/setuplib.php
@@ -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;