moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-18195 installer - improve CFG->dirroot error message

Browse source
This commit is contained in:
stronk7 2009-02-09 17:46:29 +00:00
parent c454b86c64
commit a4ac30c0e4
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/index.php
View file

@ -55,7 +55,7 @@
$dirroot = dirname(realpath("../index.php")); $dirroot = dirname(realpath("../index.php"));
/// Check correct dirroot, ignoring slashes (though should be always forward slashes). MDL-18195 /// Check correct dirroot, ignoring slashes (though should be always forward slashes). MDL-18195
if (!empty($dirroot) and str_replace('\\', '/', $dirroot) != str_replace('\\', '/', $CFG->dirroot)) { if (!empty($dirroot) and str_replace('\\', '/', $dirroot) != str_replace('\\', '/', $CFG->dirroot)) {
print_error('fixsetting', 'debug', '', (object)array('current'=>$CFG->dirroot, 'found'=>$dirroot)); print_error('fixsetting', 'debug', '', (object)array('current'=>$CFG->dirroot, 'found'=>str_replace('\\', '/', $dirroot)));
} }
/// Set some necessary variables during set-up to avoid PHP warnings later on this page /// Set some necessary variables during set-up to avoid PHP warnings later on this page

2
lang/en_utf8/debug.php
View file

@ -12,7 +12,7 @@ $string['cannotfindadmin'] = 'Could not find an admin user!';
$string['codingerror'] = 'Coding error detected, it must be fixed by a programmer: $a'; $string['codingerror'] = 'Coding error detected, it must be fixed by a programmer: $a';
$string['configmoodle'] = 'Moodle has not been configured yet. You need to edit config.php first.'; $string['configmoodle'] = 'Moodle has not been configured yet. You need to edit config.php first.';
$string['erroroccur'] = 'An error has occurred during this process'; $string['erroroccur'] = 'An error has occurred during this process';
$string['fixsetting'] = 'Please fix your settings in config.php: <p>You have:</p> <p>\$CFG->dirroot = \"$a->current\";</p> <p>but it should be:</p> <p>\$CFG->dirroot = \"$a->found\"</p>'; $string['fixsetting'] = 'Please fix your settings in config.php: <p>You have:</p> <p>\$CFG->dirroot = \'$a->current\';</p> <p>but it should be:</p> <p>\$CFG->dirroot = \'$a->found\';</p>';
$string['invalideventdata'] = 'Incorrect eventadata submitted: $a'; $string['invalideventdata'] = 'Incorrect eventadata submitted: $a';
$string['invalidarraysize'] = 'Incorrect size of arrays in params of $a'; $string['invalidarraysize'] = 'Incorrect size of arrays in params of $a';
$string['missingconfigversion'] = 'Config table does not contain version, can not continue, sorry.'; $string['missingconfigversion'] = 'Config table does not contain version, can not continue, sorry.';