Fix missing table prefix in customforms::get_custom_form_fields() #932

Author: rjmackay

application/helpers/customforms.php

@@ -55,23 +55,23 @@ public static function get_custom_form_fields($incident_id = FALSE, $form_id = N
 		// Check if the provided incident exists, then fill in the data
 		if ($valid_incident)
 		{
-			$sql = "SELECT form_field.*, form_response.form_response
-			FROM form_field
-			LEFT JOIN roles ON (roles.id = field_ispublic_visible)
+			$sql = "SELECT ff.*, fr.form_response
+			FROM `{$table_prefix}form_field` ff
+			LEFT JOIN `{$table_prefix}roles` r ON (r.id = field_ispublic_visible)
 			LEFT JOIN
-				form_response ON (
-					form_response.form_field_id = form_field.id AND
-					form_response.incident_id = :incident_id
+				`{$table_prefix}form_response` fr ON (
+					fr.form_field_id = ff.id AND
+					fr.incident_id = :incident_id
 				)
 			WHERE (access_level <= :user_level OR access_level IS NULL) "
 			. ( ! empty($form_id) ? "AND form_id = :form_id " : '')
 			. "ORDER BY field_position ASC";
 		}
 		else
 		{
-			$sql = "SELECT form_field.*
-			FROM form_field
-			LEFT JOIN roles ON (roles.id = field_ispublic_visible)
+			$sql = "SELECT ff.*
+			FROM `{$table_prefix}form_field` ff
+			LEFT JOIN `{$table_prefix}roles` r ON (r.id = field_ispublic_visible)
 			WHERE (access_level <= :user_level OR access_level IS NULL) "
 			. ( ! empty($form_id) ? "AND form_id = :form_id " : '')
 			. "ORDER BY field_position ASC";