summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mohr <christian.mohr@insitu.de>2018-01-03 14:56:09 +0100
committerChristian Mohr <christian.mohr@insitu.de>2018-01-03 14:56:09 +0100
commita0b016905a3540c05be5d0c480ca83cdd58ad850 (patch)
tree580768f7a97979835eca7acbdba21d8539d190bc
parent3b470a6934a030c4bc57ac4c070539b5dd3e13b9 (diff)
prevent _ci_vars from being cached in _ci_cached_vars
Signed-off-by: Christian Mohr <christian.mohr@insitu.de>
-rw-r--r--system/core/Loader.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 5b051e1a8..98db8d4f7 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -938,11 +938,10 @@ class CI_Loader {
*
* You can either set variables using the dedicated $this->load->vars()
* function or via the second parameter of this function. We'll merge
- * the two types and cache them so that views that are embedded within
- * other views can have access to these variables.
+ * the two types.
*/
- empty($_ci_vars) OR $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $_ci_vars);
- extract($this->_ci_cached_vars);
+ empty($this->_ci_cached_vars) OR $_ci_vars = array_merge($this->_ci_cached_vars, $_ci_vars);
+ extract($_ci_vars);
/**
* Buffer the output