diff options
author | Aleksander Machniak <alec@alec.pl> | 2014-08-04 19:03:59 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2014-08-04 19:03:59 +0200 |
commit | d61649958f205b0ad2a3c3a49f34a9269815f9b9 (patch) | |
tree | bb3991b723f639e22c659800b6c4a021b3d1153f /program/steps | |
parent | d01f9fc7f5a369284fbfd92c6e804d84147e42a1 (diff) | |
parent | 9e9dcc34bc32d5f0f382751245fdfa77d4a93a6a (diff) |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps')
-rw-r--r-- | program/steps/settings/about.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/settings/about.inc b/program/steps/settings/about.inc index 026bfc1a2..73d0b0f0d 100644 --- a/program/steps/settings/about.inc +++ b/program/steps/settings/about.inc @@ -50,7 +50,7 @@ function rcmail_plugins_list($attrib) $attrib['id'] = 'rcmpluginlist'; } - $plugins = array_filter((array) $RCMAIL->config->get('plugins')); + $plugins = array_filter($RCMAIL->plugins->active_plugins); $plugin_info = array(); foreach ($plugins as $name) { @@ -61,8 +61,8 @@ function rcmail_plugins_list($attrib) // load info from required plugins, too foreach ($plugin_info as $name => $info) { - if (is_array($info['required']) && !empty($info['required'])) { - foreach ($info['required'] as $req_name) { + if (is_array($info['require']) && !empty($info['require'])) { + foreach ($info['require'] as $req_name) { if (!isset($plugin_info[$req_name]) && ($req_info = $RCMAIL->plugins->get_info($req_name))) { $plugin_info[$req_name] = $req_info; } |