summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-12-26 19:42:34 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-12-26 19:42:34 +0100
commiteb7494ff6912f5a30f21ae1d7877c34bf72234e3 (patch)
tree9d1454c1536aea36ddef36e6621eff7a1f37f0bc
parent5b8c6058794e0b68916b69936ae30e03cf4a9b59 (diff)
parent81dd22393368862760e1cfb30a0d73d070cd38af (diff)
Merge pull request #680 from bubbafoley/load_get_vars
Added method get_vars() to CI_Loader.
-rw-r--r--system/core/Loader.php14
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/libraries/loader.rst6
3 files changed, 21 insertions, 0 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 12d07bbe0..83d134ef4 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -495,6 +495,20 @@ class CI_Loader {
// --------------------------------------------------------------------
/**
+ * Get Variables
+ *
+ * Retrieve all loaded variables
+ *
+ * @return array
+ */
+ public function get_vars()
+ {
+ return $this->_ci_cached_vars;
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Load Helper
*
* This function loads the specified helper file.
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 60425a436..be83f09e4 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -62,6 +62,7 @@ Release Date: Not Released
- Changed private functions in CI_URI to protected so MY_URI can
override them.
- Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
+ - Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars()
Bug fixes for 3.0
------------------
diff --git a/user_guide_src/source/libraries/loader.rst b/user_guide_src/source/libraries/loader.rst
index bbe2ed530..2090404bf 100644
--- a/user_guide_src/source/libraries/loader.rst
+++ b/user_guide_src/source/libraries/loader.rst
@@ -165,6 +165,12 @@ This function checks the associative array of variables available to
your views. This is useful if for any reason a var is set in a library
or another controller method using $this->load->vars().
+$this->load->get_vars()
+===========================
+
+This function retrieves all variables available to
+your views.
+
$this->load->helper('file_name')
=================================