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

diff --git a/admin/index.php b/admin/index.php
index 26803fe838b52a6decca539a31c04a142cda2389..37cabfa58e4bc23b4d29537e296f6d3857012638 100644 (file)
--- 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 9361f3ba04a8dc0d82b70501252e1b6d33b23b6f..43f630bb5049159af0d30dd58d1372d9850a862b 100644 (file)
--- 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: <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['invalidarraysize'] = 'Incorrect size of arrays in params of $a';
 $string['missingconfigversion'] = 'Config table does not contain version, can not continue, sorry.';