diff options
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Loader.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 18fba2b72..9a56b3857 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -957,18 +957,21 @@ class CI_Loader { */ // Init current _ci_vars as current variable configuration - if (!is_array($_ci_vars)) { + if ( ! is_array($_ci_vars)) + { $_ci_vars = []; } // Include the global cached vars into the current _ci_vars if needed - if (!empty($this->_ci_cached_vars)) { + if ( ! empty($this->_ci_cached_vars)) + { $_ci_vars = array_merge($this->_ci_cached_vars, $_ci_vars); } // Merge the last variable configuration from a parent _ci_load() // call into the current _ci_vars - if (!empty($this->_ci_load_vars_stack)) { + if ( ! empty($this->_ci_load_vars_stack)) + { $previous_variable_configuration = end($this->_ci_load_vars_stack); $_ci_vars = array_merge($previous_variable_configuration, $_ci_vars); } |