Merge pull request #1612 from thomseddon/fix/filter-custom-fields

fix custom field filtering for fields with spaces

app/admin/custom-fields/filter-result.php

@@ -12,6 +12,7 @@ require( dirname(__FILE__) . '/../../../functions/functions.php');
 $Database 	= new Database_PDO;
 $User 		= new User ($Database);
 $Admin	 	= new Admin ($Database);
+$Tools		= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
@@ -23,10 +24,14 @@ $User->check_maintaneance_mode ();
 $table = $_POST['table'];
 unset($_POST['table']);
 
+# fetch custom fields
+$fields = $Tools->fetch_custom_fields($table);
+
 /* enthing to write? */
 if(sizeof($_POST)>0) {
 	foreach($_POST as $k=>$v) {
-		$filtered_fields[] = $k;
+		$kTest = str_replace("___", " ", $k);
+		$filtered_fields[] = array_key_exists($kTest, $fields) ? $kTest : $k;
 	}
 }
 else {

app/admin/custom-fields/filter.php

@@ -63,11 +63,12 @@ $(".input-switch").bootstrapSwitch(switch_options);
 
 	<?php
 	foreach($custom as $k=>$c) {
+		$kNew = str_replace(" ", "___", $k);
 		print "<tr>";
 		# select
 		print "	<td style='width:20px;'>";
-		if(in_array($k, $filters[$_POST['table']]))	{ print "<input type='checkbox' class='input-switch' name='$k' checked>"; }
-		else										{ print "<input type='checkbox' class='input-switch' name='$k'>"; }
+		if(in_array($k, $filters[$_POST['table']]))	{ print "<input type='checkbox' class='input-switch' name='$kNew' checked>"; }
+		else										{ print "<input type='checkbox' class='input-switch' name='$kNew'>"; }
 		print "	</td>";
 		# remove custom_
 		$k1 = $Tools->print_custom_field_name ($k);