mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git.moodle.org:/git/integration

Browse Source
This commit is contained in:
Aparup Banerjee 2011-09-13 11:42:18 +08:00
commit 9568a4e87b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en/error.php
View File

@ -250,6 +250,7 @@ $string['headersent'] = 'Headers already sent';
$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';

8
lib/outputrenderers.php
View File

@ -2066,6 +2066,10 @@ EOD;
$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)) {
@ -2082,7 +2086,9 @@ EOD;
}
}
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);
}