diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-07-23 00:11:34 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-13 19:20:57 +0200 |
| commit | e0df07950b101316c07ccec882ae00f930bca0c6 (patch) | |
| tree | 84196c3647d80d190f959cd238be986acb8bb246 | |
| parent | 72038ba6fd2e8196623bf1bd1a38756ad41ce905 (diff) | |
Fixed conflict in changelog.
| -rw-r--r-- | system/core/Loader.php | 15 | ||||
| -rw-r--r-- | user_guide/changelog.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/loader.html | 6 |
3 files changed, 23 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. diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 95270febc..81307fe0b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -86,6 +86,8 @@ Change Log <li>Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.</li> <li class="reactor">Added <kbd>is_unique</kbd> to the <a href="libraries/form_validation.html">Form Validation library</a>.</li> <li class="reactor">Added <kbd>$this->db->set_dbprefix()</kbd> to the <a href="database/queries.html">Database Driver</a>.</li> + <li class="reactor">Changed <kbd>$this->cart->insert()</kbd> in the <a href="libraries/cart.html">Cart Library</a> to return the Row ID if a single item was inserted successfully.</li> + <li class="reactor">Added <kbd>$this->load->get_var()</kbd> to the <a href="libraries/loader.html">Loader library</a> to retrieve global vars set with <kbd>$this->load->view()</kbd> and <kbd>$this->load->vars()</kbd>.</li> </ul> </li> </ul> diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 1d93af5ed..a472730ca 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -175,6 +175,12 @@ and merged into one array for conversion to variables. </p> +<h2>$this->load->get_var(<samp>$key</samp>)</h2> + +<p>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(). +</p> + + <h2>$this->load->helper('<var>file_name</var>')</h2> <p>This function loads helper files, where <var>file_name</var> is the name of the file, without the <kbd>_helper.php</kbd> extension.</p> |