From e0df07950b101316c07ccec882ae00f930bca0c6 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Fri, 22 Jul 2011 16:11:34 -0600
Subject: Fixed conflict in changelog.
---
user_guide/libraries/loader.html | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'user_guide/libraries')
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.
+$this->load->get_var($key)
+
+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->helper('file_name')
This function loads helper files, where file_name is the name of the file, without the _helper.php extension.
--
cgit v1.2.3-24-g4f1b
From b8c038a3e7742f32915d7f1ab69627075e8d0c39 Mon Sep 17 00:00:00 2001
From: Derek Jones
Date: Sat, 20 Aug 2011 08:57:14 -0500
Subject: updated version number in user guide, removed some stray merge
markers found in the change log
---
user_guide/libraries/benchmark.html | 2 +-
user_guide/libraries/caching.html | 2 +-
user_guide/libraries/calendar.html | 2 +-
user_guide/libraries/cart.html | 2 +-
user_guide/libraries/config.html | 2 +-
user_guide/libraries/email.html | 2 +-
user_guide/libraries/encryption.html | 2 +-
user_guide/libraries/file_uploading.html | 2 +-
user_guide/libraries/form_validation.html | 2 +-
user_guide/libraries/ftp.html | 2 +-
user_guide/libraries/image_lib.html | 2 +-
user_guide/libraries/input.html | 2 +-
user_guide/libraries/javascript.html | 2 +-
user_guide/libraries/language.html | 2 +-
user_guide/libraries/loader.html | 2 +-
user_guide/libraries/output.html | 2 +-
user_guide/libraries/pagination.html | 2 +-
user_guide/libraries/parser.html | 2 +-
user_guide/libraries/security.html | 2 +-
user_guide/libraries/sessions.html | 2 +-
user_guide/libraries/table.html | 2 +-
user_guide/libraries/trackback.html | 2 +-
user_guide/libraries/typography.html | 2 +-
user_guide/libraries/unit_testing.html | 2 +-
user_guide/libraries/uri.html | 2 +-
user_guide/libraries/user_agent.html | 2 +-
user_guide/libraries/xmlrpc.html | 2 +-
user_guide/libraries/zip.html | 2 +-
28 files changed, 28 insertions(+), 28 deletions(-)
(limited to 'user_guide/libraries')
diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html
index c29acb7b2..c7b7ec9a7 100644
--- a/user_guide/libraries/benchmark.html
+++ b/user_guide/libraries/benchmark.html
@@ -28,7 +28,7 @@