From a439fb57decf98b5b630479e7ef5dc4e7f3360c9 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Fri, 8 Apr 2011 12:42:56 +0100
Subject: Updated Changelog to reflect  "CLI usage" documentation being added.

---
 user_guide/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index d34f5c8f0..32f9ec84f 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -73,6 +73,7 @@ Hg Tag: n/a</p>
 			<li class="reactor">Made Environment Support optional. Comment out or delete the constant to stop environment checks.</li>
 			<li class="reactor">Added Environment Support for Hooks.</li>
 			<li class="reactor">Added CI_ Prefix to the <a href="libraries/caching.html">Cache driver</a>.</li>
+			<li class="reactor">Added <a href="./general/cli.html">CLI usage</a> documentation.</li>
 		</ul>
 	</li>
 	<li>Helpers
-- 
cgit v1.2.3-24-g4f1b


From b70e32ffae21c6a7ae4d21f2991a47f28531676f Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Fri, 8 Apr 2011 12:44:17 +0100
Subject: Fixed bug with form_helper calling now protected variables.

---
 system/helpers/form_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 8aa788c6c..acd75c239 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -67,7 +67,7 @@ if ( ! function_exists('form_open'))
 		// CSRF
 		if ($CI->config->item('csrf_protection') === TRUE)
 		{
-			$hidden[$CI->security->csrf_token_name] = $CI->security->csrf_hash;
+			$hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash();
 		}
 
 		if (is_array($hidden) AND count($hidden) > 0)
-- 
cgit v1.2.3-24-g4f1b