Merge branch 'hotfix-2.3.127'

2015-09-16 15:34:32 +02:00 · 2015-09-16 15:34:32 +02:00 · dfdcc722d6
parent b8fae35f34 14188f1367
commit dfdcc722d6
2 changed files with 2 additions and 1 deletions
--- a/VERSION.json
+++ b/VERSION.json
@ -1 +1 @@
-{"major":2, "minor":3, "hotfix":126}
+{"major":2, "minor":3, "hotfix":127}
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@ -1009,6 +1009,7 @@ class Attribute extends AppModel {
 							'AND' => array(
 								'Attribute.type !=' => $this->nonCorrelatingTypes,
 								'Attribute.id !=' => $a['id'],
+								'Attribute.event_id !=' => $a['event_id']
 							),
 						),
 						'recursive => -1',