Commits

Greg Aker committed 1adb350 Merge

Merging in default branch

Comments (0)

Files changed (2)

system/database/drivers/mysqli/mysqli_driver.php

 		if ( ! isset($use_set_names))
 		{
 			// mysqli_set_charset() requires MySQL >= 5.0.7, use SET NAMES as fallback
-			$use_set_names = (version_compare(mysql_get_server_info(), '5.0.7', '>=')) ? FALSE : TRUE;
+			$use_set_names = (version_compare(mysqli_get_server_info($this->conn_id), '5.0.7', '>=')) ? FALSE : TRUE;
 		}
 
 		if ($use_set_names)

system/helpers/form_helper.php

 	function validation_errors($prefix = '', $suffix = '')
 	{
 		if (FALSE === ($OBJ =& _get_validation_object()))
-		{var_dump(_get_validation_object()); exit;
+		{
 			return '';
 		}