Merge branch 'jansa'

admin/application/models/Login_model.php

@@ -16,11 +16,11 @@ class Login_model extends CI_Model {
 	    }
 	    else if($query_user->num_rows() > 0 )
 	    {
-	    	$rows = $query_user->row_array();
+	    	$row = $query_user->row_array();
 	    	//$query_user['email_id'] = decrypt_data($rows['email_id']);
 	    	//$query_user['phone_no'] = decrypt_data($rows['phone_no']);
 	    	//$query_user['display_name'] = decrypt_data($rows['display_name']);
-	    	$row = $query_user;
+	    	//$row = $query_user;
 	    	$row['uType'] = 'admin_user';
 	    	$row['table'] = 'users';
 	       	return $row;