Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor

1 files changed, 11 insertions, 13 deletions

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index a5cd97b82..51a9c6ca3 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -1032,22 +1032,20 @@ if ( ! function_exists('_get_validation_object'))
 	{
 		$CI =& get_instance();
 
-		// We set this as a variable since we're returning by reference
+		// We set this as a variable since we're returning by reference.
 		$return = FALSE;
-
-		if ( ! isset($CI->load->_ci_classes) OR  ! isset($CI->load->_ci_classes['form_validation']))
-		{
-			return $return;
-		}
-
-		$object = $CI->load->_ci_classes['form_validation'];
-
-		if ( ! isset($CI->$object) OR ! is_object($CI->$object))
+		
+		if ( ! ($object = $CI->load->is_loaded('form_validation')))
 		{
-			return $return;
+			if ( ! isset($CI->$object) OR ! is_object($CI->$object))
+			{
+				return $return;
+			}
+			
+			return $CI->$object;
 		}
-
-		return $CI->$object;
+		
+		return $return;
 	}
 }