Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression when startup() method of some "by role plugins" could be called when not expected, causing PHP errors

Browse source
This commit is contained in:
Aleksander Machniak 2017-10-03 10:13:10 +02:00
parent 915b86bb80
commit 1abc73cf34
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/kolab_auth/kolab_auth.php
View file

@ -331,8 +331,8 @@ class kolab_auth extends rcube_plugin
// Some plugins e.g. kolab_2fa use 'startup' hook to // Some plugins e.g. kolab_2fa use 'startup' hook to
// register other hooks, but when called on 'authenticate' hook // register other hooks, but when called on 'authenticate' hook
// we're already after 'startup', so we'll call it directly // we're already after 'startup', so we'll call it directly
if ($loaded && $startup && ($plugin = $this->api->get_plugin($plugin)) if ($loaded && $startup && $plugin == 'kolab_2fa'
&& method_exists($plugin, 'startup') && ($plugin = $this->api->get_plugin($plugin))
) { ) {
$plugin->startup(array('task' => $rcmail->task, 'action' => $rcmail->action)); $plugin->startup(array('task' => $rcmail->task, 'action' => $rcmail->action));
} }