Fixed issues on defined constants

rougin · Sep 18, 2015 · d21a5d8 · d21a5d8
1 parent 252a330
commit d21a5d8
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/src/Instance.php b/src/Instance.php
@@ -64,14 +64,17 @@ public function __construct()
 
         $slash = DIRECTORY_SEPARATOR;
 
-        foreach ($iterator as $path) {
-            $core = 'core' . $slash . 'CodeIgniter.php';
+        if ( ! defined('BASEPATH')) {
+            foreach ($iterator as $path) {
+                $core = 'core' . $slash . 'CodeIgniter.php';
+
+                if (strpos($path->__toString(), $core) !== FALSE) {
+                    $basepath = str_replace($core, '', $path->__toString());
 
-            if (strpos($path->__toString(), $core) !== FALSE) {
-                $basepath = str_replace($core, '', $path->__toString());
-                define('BASEPATH', $basepath);
+                    define('BASEPATH', $basepath);
 
-                break;
+                    break;
+                }
             }
         }
 
@@ -83,16 +86,23 @@ public function __construct()
 
         // Load the Common and Base Controller class
         require BASEPATH . 'core/Common.php';
-        require BASEPATH . 'core/Controller.php';
+
+        if ( ! class_exists('CI_Controller')) {
+            require BASEPATH . 'core/Controller.php';
+        }
 
         /**
          * Load the framework constants
          */
 
-        if (file_exists(APPPATH . 'config/' . ENVIRONMENT . '/constants.php')) {
-            require APPPATH . 'config/' . ENVIRONMENT . '/constants.php';
-        } else {
-            require APPPATH . 'config/constants.php';
+        if ( ! defined('FILE_READ_MODE')) {
+            $constants = APPPATH . 'config/' . ENVIRONMENT . '/constants.php';
+
+            if (file_exists($constants)) {
+                require $constants;
+            } else {
+                require APPPATH . 'config/constants.php';
+            }
         }
 
         // Important charset-related stuff