summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2022-01-05 22:02:14 +0100
committerAndrey Andreev <narf@devilix.net>2022-01-05 22:02:14 +0100
commit627f1058c1d72b267ab8ab441219198d6f2c24c6 (patch)
tree5999636aa8ebe4ee6273017df541bceb60fde8c9 /system/core
parentc9a9d82bbc966c97876c2b6d5bc94ae3f4b4135f (diff)
Whoops. Broke something in 004f0a1b41c27e3d40f62a51300599d35c54c0c0
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index aea1d82ed..2233021a0 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -953,7 +953,7 @@ class CI_Loader {
* configuration.
*/
- is_array($_ci_vars) && $_ci_vars = array();
+ is_array($_ci_vars) OR $_ci_vars = array();
// Include the global cached vars into the current _ci_vars if needed
empty($this->_ci_cached_vars) OR $_ci_vars = array_merge($this->_ci_cached_vars, $_ci_vars);