Changeset 6824 for branches/2.4/prototype/modules/filters/interceptors/FilterMapping.php

Timestamp:

07/19/12 17:07:48 (12 years ago)

Author:

eduardow

Message:

Ticket #2959 - Considerar mais de uma regra para uma mesma msg no filtro de msgs.

File:

• branches/2.4/prototype/modules/filters/interceptors/FilterMapping.php (modified) (2 diffs)

branches/2.4/prototype/modules/filters/interceptors/FilterMapping.php

@@ -122 +122 @@
                         $action   = $data['actions'];
                         
-                        ($i >0) ? $script_match = 'els' : $script_match = '';
+                        ($i >0 && $verifyNextRule == 'false') ? $script_match = 'els' : $script_match = ''; 
                         $data['isExact'] == 'false' ?  $script_match .= 'if anyof (' : $script_match .= 'if allof (';
+
+                        $verifyNextRule = 'false';
 
                         if( is_array($criteria) )
@@ -275 +277 @@
                         $script_criteria = "";  
                         $script_action = "";
-                        $data['applyMessages'] = "";                                                    
+                        $data['applyMessages'] = "";     
+        
+                $verifyNextRule = $data['verifyNextRule'];                                                      
                 }