commit 0817413d550cb5a6085fdce9bae486e9bafd8665 Author: Damien Tournoud Date: Mon Sep 24 20:57:41 2012 +0200 Issue #1410306: make the query alteration code more robust. diff --git a/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/plugins/selection/EntityReference_SelectionHandler_Generic.class.php index 6f9a267..9c34258 100644 --- a/plugins/selection/EntityReference_SelectionHandler_Generic.class.php +++ b/plugins/selection/EntityReference_SelectionHandler_Generic.class.php @@ -356,7 +356,7 @@ class EntityReference_SelectionHandler_Generic_user extends EntityReference_Sele // database. $conditions = &$query->conditions(); foreach ($conditions as $key => $condition) { - if ($key !== '#conjunction' && $condition['field'] == 'users.name') { + if ($key !== '#conjunction' && is_string($condition['field']) && $condition['field'] === 'users.name') { // Remove the condition. unset($conditions[$key]); @@ -413,7 +413,7 @@ class EntityReference_SelectionHandler_Generic_comment extends EntityReference_S // bundle. $conditions = &$query->conditions(); foreach ($conditions as $key => &$condition) { - if ($key !== '#conjunction' && $condition['field'] == 'node_type') { + if ($key !== '#conjunction' && is_string($condition['field']) && $condition['field'] === 'node_type') { $condition['field'] = $node_alias . '.type'; foreach ($condition['value'] as &$value) { if (substr($value, 0, 13) == 'comment_node_') { @@ -480,7 +480,7 @@ class EntityReference_SelectionHandler_Generic_taxonomy_term extends EntityRefer // the bundle. $conditions = &$query->conditions(); foreach ($conditions as $key => &$condition) { - if ($key !== '#conjunction' && $condition['field'] == 'vocabulary_machine_name') { + if ($key !== '#conjunction' && is_string($condition['field']) && $condition['field'] === 'vocabulary_machine_name') { $condition['field'] = $vocabulary_alias . '.machine_name'; break; }