diff options
| -rw-r--r-- | system/core/Loader.php | 2 | ||||
| -rwxr-xr-x | tests/mocks/database/ci_test.sqlite | bin | 19456 -> 19456 bytes |
2 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); diff --git a/tests/mocks/database/ci_test.sqlite b/tests/mocks/database/ci_test.sqlite Binary files differindex dae2ec2a0..db14455eb 100755 --- a/tests/mocks/database/ci_test.sqlite +++ b/tests/mocks/database/ci_test.sqlite |