From: stronk7 <stronk7>
Date: Mon, 9 Feb 2009 17:30:11 +0000 (+0000)
Subject: MDL-18195 installer - ignore differences in slashes when checking $CFG->dirroot
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c454b86c64c7ad23efbe47eed81f894c0b5ade19;p=moodle.git

MDL-18195 installer - ignore differences in slashes when checking $CFG->dirroot
---

diff --git a/admin/index.php b/admin/index.php
index b7eec1d41a..26803fe838 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -53,7 +53,8 @@
 /// Check settings in config.php
 
     $dirroot = dirname(realpath("../index.php"));
-    if (!empty($dirroot) and $dirroot != $CFG->dirroot) {
+    /// 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));
     }