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

Sam Hemelryk · Sam Hemelryk · commit 417fdfab6bbd · 2011-07-25T11:04:02.000+08:00
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;

Original file line number	Diff line number	Diff line change
`@@ -501,6 +501,12 @@ function get_exception_info($ex) {`
`501`	`501`	`}`
`502`	`502`	`}`
`503`	`503`
	`504`	`+ // when printing an error the continue button should never link offsite`
	`505`	`+ if (stripos($link, $CFG->wwwroot) === false &&`
	`506`	`+ stripos($link, $CFG->httpswwwroot) === false) {`
	`507`	`+ $link = $CFG->wwwroot.'/';`
	`508`	`+ }`
	`509`	`+`
`504`	`510`	`$info = new stdClass();`
`505`	`511`	`$info->message = $message;`
`506`	`512`	`$info->errorcode = $errorcode;`