summaryrefslogtreecommitdiff
path: root/program/steps/settings
diff options
context:
space:
mode:
Diffstat (limited to 'program/steps/settings')
-rw-r--r--program/steps/settings/about.inc6
-rw-r--r--program/steps/settings/folders.inc2
2 files changed, 4 insertions, 4 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;
}
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 19c4457a1..061cd8893 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -373,7 +373,7 @@ function rcube_subscription_form($attrib)
array_unshift($plugin['list'], $root);
- for ($i = 0, $length = count($plugin['list'])-1; $i<$length; $i++) {
+ for ($i = 0, $length = count($plugin['list']); $i<$length; $i++) {
$folders[] = rcmail_folder_tree_element($plugin['list'], $i, $js_folders);
}