Permalink
Browse files

Merged branch '28595_m22_installcontinue' of git://github.com/skodak/…

…moodle with changes
  • Loading branch information...
2 parents a6f388c + 94a720f commit 6bc526319e12437202c75b1c1114e8996199de33 Sam Hemelryk committed Sep 13, 2011
Showing with 8 additions and 1 deletion.
  1. +1 −0 lang/en/error.php
  2. +7 −1 lib/outputrenderers.php
View
@@ -250,6 +250,7 @@
$string['idnumbertaken'] = 'ID number is already used for another course';
$string['importformatnotimplement'] = 'Sorry, importing this format is not yet implemented!';
$string['incorrectext'] = 'File has an incorrect extension';
+$string['installproblem'] = 'It is usually not possible to recover from errors triggered during installation, you may need to create a new database or use a different database prefix if you want to retry the installation.';
$string['internalauthpassworderror'] = 'Missing password or invalid password policy for internal authentication';
$string['invalidaccess'] = 'This page was not accessed correctly';
$string['invalidaccessparameter'] = 'Invalid access parameter';
View
@@ -2029,6 +2029,10 @@ public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginf
$message = '<p class="errormessage">' . $message . '</p>'.
'<p class="errorcode"><a href="' . $moreinfourl . '">' .
get_string('moreinformation') . '</a></p>';
+ if (empty($CFG->rolesactive)) {
+ $message .= '<p class="errormessage">' . get_string('installproblem', 'error') . '</p>';
+ //It is usually not possible to recover from errors triggered during installation, you may need to create a new database or use a different database prefix for new installation.
+ }
$output .= $this->box($message, 'errorbox');
if (debugging('', DEBUG_DEVELOPER)) {
@@ -2045,7 +2049,9 @@ public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginf
}
}
- if (!empty($link)) {
+ if (empty($CFG->rolesactive)) {
+ // continue does not make much sense if moodle is not installed yet because error is most probably not recoverable
+ } else if (!empty($link)) {
$output .= $this->continue_button($link);
}

0 comments on commit 6bc5263

Please sign in to comment.