From c28b2855e572f744f66aebe1d6a09b1b2d25e8ad Mon Sep 17 00:00:00 2001
From: Marcos Coelho <marcos@marcoscoelho.com>
Date: Tue, 5 Jul 2011 12:59:41 -0700
Subject: enable use of param in a callback rule; it's a sugestion of solution,
 another way can be used, this feature seems forgotten;

---
 system/libraries/Form_validation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index d370d75ee..a34809e05 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -488,7 +488,7 @@ class CI_Form_validation {
 		if ( ! in_array('required', $rules) AND is_null($postdata))
 		{
 			// Before we bail out, does the rule contain a callback?
-			if (preg_match("/(callback_\w+)/", implode(' ', $rules), $match))
+			if (preg_match("/(callback_\w+(\[.*?\])?)/", implode(' ', $rules), $match))
 			{
 				$callback = TRUE;
 				$rules = (array('1' => $match[1]));
@@ -1378,4 +1378,4 @@ class CI_Form_validation {
 // END Form Validation Class
 
 /* End of file Form_validation.php */
-/* Location: ./system/libraries/Form_validation.php */
\ No newline at end of file
+/* Location: ./system/libraries/Form_validation.php */
-- 
cgit v1.2.3-24-g4f1b


From 7dafce416ebbfa5a2a43c4fd40be5ab4e81bc739 Mon Sep 17 00:00:00 2001
From: MarcosCoelho <marcos@marcoscoelho.com>
Date: Sat, 16 Jul 2011 02:57:47 -0300
Subject: explains how use a parameter/argument (optional) in your callback
 rule declaration

---
 user_guide/libraries/form_validation.html | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html
index bba8f507e..da2f5e5e8 100644
--- a/user_guide/libraries/form_validation.html
+++ b/user_guide/libraries/form_validation.html
@@ -508,11 +508,9 @@ create a callback function that does that.  Let's create a example of this.</p>
 
 <code>$this->form_validation->set_rules('username', 'Username', '<kbd>callback_username_check</kbd>');</code>
 
-
 <p>Then add a new function called <dfn>username_check</dfn> to your controller.  Here's how your controller should now look:</p>
 
-
-<textarea class="textarea" style="width:100%" cols="50" rows="44">&lt;?php
+<textarea class="textarea" style="width:100%" cols="50" rows="40">&lt;?php
 
 class Form extends CI_Controller {
 
@@ -556,14 +554,13 @@ class Form extends CI_Controller {
 <p><dfn>Reload your form and submit it with the word "test" as the username.  You can see that the form field data was passed to your
 callback function for you to process.</dfn></p>
 
-<p><strong>To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.</strong></p>
+<p>To invoke a callback just put the function name in a rule, with "callback_" as the rule <strong>prefix</strong>. If you need
+to receive an extra parameter in your callback function, just add it normally after the function name between square brackets,
+as in: "callback_foo<strong>[bar]</strong>", then it will be passed as the second argument of your callback function.</p>
 
-<p>You can also process the form data that is passed to your callback and return it.  If your callback returns anything other than a boolean TRUE/FALSE
+<p><strong>Note:</strong> You can also process the form data that is passed to your callback and return it.  If your callback returns anything other than a boolean TRUE/FALSE
 it is assumed that the data is your newly processed form data.</p>
 
-
-
-
 <a name="settingerrors"></a>
 <h2>Setting Error Messages</h2>
 
-- 
cgit v1.2.3-24-g4f1b


From 8fdda7907446db9ae2b9096a7caf361d4af98ce6 Mon Sep 17 00:00:00 2001
From: MarcosCoelho <marcos@marcoscoelho.com>
Date: Sat, 16 Jul 2011 03:10:14 -0300
Subject: updating the change log

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

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index a924edc9c..d6116d0ce 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -87,6 +87,7 @@ 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">Added support to set an optional parameter in your callback rules of validation using the <a href="libraries/form_validation.html">Form Validation library</a>.</li>
 		</ul>
 	</li>
 </ul>
-- 
cgit v1.2.3-24-g4f1b