diff --git a/admin/index.php b/admin/index.php index 26803fe838b..37cabfa58e4 100644 --- a/admin/index.php +++ b/admin/index.php @@ -55,7 +55,7 @@ $dirroot = dirname(realpath("../index.php")); /// Check correct dirroot, ignoring slashes (though should be always forward slashes). MDL-18195 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 diff --git a/lang/en_utf8/debug.php b/lang/en_utf8/debug.php index 9361f3ba04a..43f630bb504 100644 --- a/lang/en_utf8/debug.php +++ b/lang/en_utf8/debug.php @@ -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['configmoodle'] = 'Moodle has not been configured yet. You need to edit config.php first.'; $string['erroroccur'] = 'An error has occurred during this process'; -$string['fixsetting'] = 'Please fix your settings in config.php:

You have:

\$CFG->dirroot = \"$a->current\";

but it should be:

\$CFG->dirroot = \"$a->found\"

'; +$string['fixsetting'] = 'Please fix your settings in config.php:

You have:

\$CFG->dirroot = \'$a->current\';

but it should be:

\$CFG->dirroot = \'$a->found\';

'; $string['invalideventdata'] = 'Incorrect eventadata submitted: $a'; $string['invalidarraysize'] = 'Incorrect size of arrays in params of $a'; $string['missingconfigversion'] = 'Config table does not contain version, can not continue, sorry.';