[SM-CVS] SF.net SVN: squirrelmail: [12343] trunk/squirrelmail/functions/plugin.php

[<pdo...@us...>]

Revision: 12343
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12343&view=rev
Author:   pdontthink
Date:     2007-03-20 16:17:14 -0700 (Tue, 20 Mar 2007)

Log Message:
-----------
Fix loss of 

Modified Paths:
--------------
    trunk/squirrelmail/functions/plugin.php

Modified: trunk/squirrelmail/functions/plugin.php
===================================================================
--- trunk/squirrelmail/functions/plugin.php	2007-03-19 22:44:58 UTC (rev 12342)
+++ trunk/squirrelmail/functions/plugin.php	2007-03-20 23:17:14 UTC (rev 12343)
@@ -81,6 +81,12 @@
             use_plugin($plugin_name);
             if (function_exists($function)) {
                 $ret = $function($args, $ret);
+
+                // each plugin can call additional hooks, so need
+                // to make sure the current hook name is accurate
+                // again after each plugin has finished
+                //
+                $currentHookName = $name;
             }
         }
     }
@@ -148,6 +154,12 @@
                 if (!empty($plugin_ret)) {
                     $ret = sqm_array_merge($ret, $plugin_ret);
                 }
+
+                // each plugin can call additional hooks, so need
+                // to make sure the current hook name is accurate
+                // again after each plugin has finished
+                //
+                $currentHookName = $name;
             }
         }
     }
@@ -208,6 +220,12 @@
                 } else {
                     $nay++;
                 }
+
+                // each plugin can call additional hooks, so need
+                // to make sure the current hook name is accurate
+                // again after each plugin has finished
+                //
+                $currentHookName = $name;
             }
         }
         $currentHookName = '';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.