Changeset 2907 in subversion

Timestamp:

Sep 1, 2009 12:18:05 PM (4 years ago)

Author:

alec

Message:

• fix loading required plugins (#1486079)

File:

• trunk/roundcubemail/program/include/rcube_plugin_api.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_plugin_api.php

@@ -119 +119 @@
         $fn = $plugins_dir->path . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
         if (file_exists($fn)) {
-          include($fn);
+          include_once($fn);
           
           if (class_exists($plugin_name, false)) {
@@ -125 +125 @@
             // check inheritance
             if (is_subclass_of($plugin, 'rcube_plugin')) {
-              $plugin->init();
-              $this->plugins[] = $plugin;
-              $loaded = true;
+              if (!$plugin->task || preg_match('/('.$plugin->task.')/i', $rcmail->task)) {
+                $plugin->init();
+                $this->plugins[] = $plugin;
+              }
+              $loaded = true;
             }
           }