Merge pull request ezsystems#1187 from guillaumelecerf/EZP-24565

Fix EZP-24565: correctly quote attributes of custom AttributeFilters
ezpublishlegacy · Sep 4, 2015 · 1f02082 · 1f02082
2 parents fbe65da + d8423e3
commit 1f02082
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/kernel/classes/ezcontentobjecttreenode.php b/kernel/classes/ezcontentobjecttreenode.php
@@ -1178,6 +1178,7 @@ static function createAttributeFilterSQLStrings( &$attributeFilter, &$sortingInf
                                 if ( $filterDataType == 'string' )
                                 {
                                     $sortKey = 'sort_key_string';
+                                    $filterFieldType = 'string';
                                 }
                                 else
                                 {

diff --git a/tests/tests/kernel/classes/ezcontentobjecttreenode_test2.php b/tests/tests/kernel/classes/ezcontentobjecttreenode_test2.php
@@ -30,6 +30,19 @@ public function providerForTestIssue23528()
             array( 'class_identifier', "                            ( ezcontentclass.identifier IN ('1','3','foo','1foo','foo_1')  ) AND " ),
             array( 'class_name',       "                            ( ezcontentclass_name.name IN ('1','3','foo','1foo','foo_1')  ) AND " ),
             array( 'name',             "                            ( ezcontentobject_name.name IN ('1','3','foo','1foo','foo_1')  ) AND " ),
+            // custom
+            array( 1,                  "
+                                  a0.contentobject_id = ezcontentobject.id AND
+                                  a0.contentclassattribute_id = 1 AND
+                                  a0.version = ezcontentobject_name.content_version AND 
+ ( a0.language_id & ezcontentobject.language_mask > 0 AND
+     ( (   ezcontentobject.language_mask - ( ezcontentobject.language_mask & a0.language_id ) ) & 1 )
+   + ( ( ( ezcontentobject.language_mask - ( ezcontentobject.language_mask & a0.language_id ) ) & 2 ) )
+   <
+     ( a0.language_id & 1 )
+   + ( ( a0.language_id & 2 ) )
+ ) 
+ AND                             ( a0.sort_key_string IN ('1','3','foo','1foo','foo_1')  ) AND " ),
         );
     }