Merge remote-tracking branch 'upstream/develop' into develop

1 files changed, 1 insertions, 1 deletions

diff --git a/index.php b/index.php
index 34addf8c3..4dbc12a5a 100755
--- a/index.php
+++ b/index.php
@@ -225,7 +225,7 @@ switch (ENVIRONMENT)
 	define('BASEPATH', str_replace('\\', '/', $system_path));
 
 	// Path to the front controller (this file)
-	define('FCPATH', str_replace(SELF, '', __FILE__));
+	define('FCPATH', dirname(__FILE__).'/');
 
 	// Name of the "system folder"
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));