summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-07-23 00:11:34 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-13 19:20:57 +0200
commite0df07950b101316c07ccec882ae00f930bca0c6 (patch)
tree84196c3647d80d190f959cd238be986acb8bb246 /system/core
parent72038ba6fd2e8196623bf1bd1a38756ad41ce905 (diff)
Fixed conflict in changelog.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 721c196cc..7c8b298ac 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -389,6 +389,21 @@ class CI_Loader {
// --------------------------------------------------------------------
/**
+ * Get Variable
+ *
+ * Check if a variable is set and retrieve it.
+ *
+ * @param array
+ * @return void
+ */
+ public function get_var($key)
+ {
+ return isset($this->_ci_cached_vars[$key]) ? $this->_ci_cached_vars[$key] : NULL;
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Load Helper
*
* This function loads the specified helper file.