aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-05-08 13:29:14 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-05-08 13:29:14 +0000
commit17d97908d3e6d1c8a141364f9b4088d54d686394 (patch)
tree10b8ea64be46cada3ec437e217fe4194ee95a772
parent722c90daf0b7d8c4853b7584cc5b50bb17d5e7b6 (diff)
downloadelgg-17d97908d3e6d1c8a141364f9b4088d54d686394.tar.gz
elgg-17d97908d3e6d1c8a141364f9b4088d54d686394.tar.bz2
System default plugins now accepts array as well as CSV
git-svn-id: https://code.elgg.org/elgg/trunk@3269 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--actions/systemsettings/install.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 04dbe87e4..69d321477 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -88,8 +88,12 @@
// activate some plugins by default
if (isset($CONFIG->default_plugins))
- {
- $plugins = explode(',', $CONFIG->default_plugins);
+ {
+ if (!is_array($CONFIG->default_plugins))
+ $plugins = explode(',', $CONFIG->default_plugins);
+ else
+ $CONFIG->default_plugins = $CONFIG->default_plugins;
+
foreach ($plugins as $plugin)
enable_plugin(trim($plugin), $site->getGUID());
}