Merge branch 'integration'

symphonists · Oct 7, 2015 · ff955e2 · ff955e2
2 parents ea69ac9 + 94569ee
commit ff955e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/extension.driver.php b/extension.driver.php
@@ -308,8 +308,7 @@ public function install() {
 					`disable_pagination` enum('yes','no') default 'no',
 					`filtered_fields` varchar(255) DEFAULT NULL,
 					PRIMARY KEY  (`id`),
-					UNIQUE KEY `field_id` (`field_id`),
-					UNIQUE KEY `unique`(`entry_id`)
+					UNIQUE KEY `field_id` (`field_id`)
 				) TYPE=MyISAM
 			");
 		}

diff --git a/fields/field.order_entries.php b/fields/field.order_entries.php
@@ -427,7 +427,7 @@ public function buildFilteringSQL($filters,$prefix =''){
 			foreach ($filterableFields as $key => $filterable_field) {
 				if (isset($filters[$filterable_field])){
 					$where .= " AND {$prefix}field_{$filterable_field} = '{$filters[$filterable_field]}'";
-				} else {						
+				} else {
 					$where .= " AND {$prefix}field_{$filterable_field} is NULL";
 				}
 			}