summaryrefslogtreecommitdiff
path: root/program/include/rcmail.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-02-19 08:31:43 +0100
committerAleksander Machniak <alec@alec.pl>2015-02-19 08:31:43 +0100
commit3665d1e8ece98ea2093d464087b2cd856df73bd6 (patch)
tree73e8420c39b713c2547de2a7bebce691b2f8dc68 /program/include/rcmail.php
parent31ed9162d1995b7603844ee49164744e16f1033b (diff)
parentde89d46be24f6b3454a0c0e62973af947b22ff29 (diff)
Merge pull request #259 from corbosman/plugin_preload
Plugin preload
Diffstat (limited to 'program/include/rcmail.php')
-rw-r--r--program/include/rcmail.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 2327109c0..6e74560cb 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -93,6 +93,10 @@ class rcmail extends rcube
$this->filename = $basename;
}
+ // load all configured plugins
+ $this->plugins->load_plugins((array)$this->config->get('plugins', array()),
+ array('filesystem_attachments', 'jqueryui'));
+
// start session
$this->session_init();
@@ -124,10 +128,8 @@ class rcmail extends rcube
$GLOBALS['OUTPUT'] = $this->load_gui(!empty($_REQUEST['_framed']));
}
- // load plugins
+ // run init method on all the plugins
$this->plugins->init($this, $this->task);
- $this->plugins->load_plugins((array)$this->config->get('plugins', array()),
- array('filesystem_attachments', 'jqueryui'));
}
/**