Changeset 6789 for trunk/prototype/modules/filters/interceptors/FilterMapping.php

Timestamp:

07/16/12 16:00:06 (12 years ago)

Author:

airton

Message:

Ticket #2959 - Considerar mais de uma regra para uma mesma mensagem no filtro de mensagem

File:

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

trunk/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) )
                         foreach ($criteria as $j => $value)
@@ -275 +277 @@
                         $script_criteria = "";  
                         $script_action = "";
-                        $data['applyMessages'] = "";                                                    
+                        $data['applyMessages'] = "";    
+
+                        $verifyNextRule = $data['verifyNextRule'];      
                 }