Really make sure plugins aren't initialized twice

Aleksander Machniak

2015-02-24 75e8a7d31352770ed029286e1e1b7bdb64311da9

Really make sure plugins aren't initialized twice

 program/lib/Roundcube/rcube_plugin_api.php

@@ -95,7 +95,7 @@

        foreach ($this->plugins as $plugin) {
            // ... task, request type and framed mode
            if (!$this->filter($plugin)) {
            if (!$this->plugins_initialized[$plugin_name] && !$this->filter($plugin)) {
                $plugin->init();
                $this->plugins_initialized[$plugin->ID] = $plugin;
            }
@@ -132,7 +132,7 @@

            // load required core plugin if no derivate was found
            if (!$loaded) {
                $loaded = $this->load_plugin($plugin_name, true);
                $loaded = $this->load_plugin($plugin_name);
            }

            // trigger fatal error if still not loaded