Changeset 3189 in subversion

Timestamp:

Dec 30, 2009 7:33:15 AM (3 years ago)

Author:

alec

Message:

• Managesieve: Fix requires generation for multiple actions (#1486397)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• plugins/managesieve/Changelog (modified) (1 diff)
• plugins/managesieve/lib/rcube_sieve.php (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Managesieve: Fix requires generation for multiple actions (#1486397)
 - Fix LDAP problem with special characters in RDN (#1486320)
 - Improved handling of message parts of type message/rfc822

trunk/roundcubemail/plugins/managesieve/Changelog

@@ +1 @@
+- Fix requires generation when many modules are used
+
 * version 2.0 [2009-11-02]
 -----------------------------------------------------------

trunk/roundcubemail/plugins/managesieve/lib/rcube_sieve.php

@@ -449 +449 @@
           // action(s)
           foreach ($rule['actions'] as $action)
+          {
             switch ($action['type'])
             {
@@ -492 +493 @@
               break;
             }
-          
+
+            if ($extension && !isset($exts[$extension]))
+              $exts[$extension] = $extension;
+          }
+
           $script .= "}\n";
           $idx++;
-
-          if ($extension && !isset($exts[$extension]))
-            $exts[$extension] = $extension;
         }