summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-04-22 17:21:32 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-04-22 17:21:32 +0200
commit27aa2cd5e1f4107a0b00cdc650bfe9a2e1eeffeb (patch)
tree41d14874d3066441ffea7ac9062e69da1c7021a2
parentd127e611c64fd1cf6a750b20c4e35b1158e06e27 (diff)
parentc6d918ad24a8844e9de1e145f545bc9f2c7ca9a6 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
-rw-r--r--system/helpers/form_helper.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 51a9c6ca3..16eb4b2c9 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -898,7 +898,7 @@ if ( ! function_exists('validation_errors'))
function validation_errors($prefix = '', $suffix = '')
{
if (FALSE === ($OBJ =& _get_validation_object()))
- {
+ {var_dump(_get_validation_object()); exit;
return '';
}
@@ -1035,7 +1035,7 @@ if ( ! function_exists('_get_validation_object'))
// We set this as a variable since we're returning by reference.
$return = FALSE;
- if ( ! ($object = $CI->load->is_loaded('form_validation')))
+ if (FALSE !== ($object = $CI->load->is_loaded('form_validation')))
{
if ( ! isset($CI->$object) OR ! is_object($CI->$object))
{