aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-03 17:04:59 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-03 17:04:59 +0000
commit99f68895e5b04e32a50a6a429b3809a741fc049f (patch)
treeeb88c5b020599565769deae930e0da5f888d5a6a /actions
parent5c34bf26bf7e01d34cde51fd63960bdb6c17bb8c (diff)
downloadelgg-99f68895e5b04e32a50a6a429b3809a741fc049f.tar.gz
elgg-99f68895e5b04e32a50a6a429b3809a741fc049f.tar.bz2
Closes #399
git-svn-id: https://code.elgg.org/elgg/trunk@2180 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions')
-rw-r--r--actions/systemsettings/install.php23
1 files changed, 16 insertions, 7 deletions
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index a72548aea..25846d6f1 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -81,13 +81,22 @@
// activate some plugins by default
- enable_plugin('profile', $site->getGUID());
- enable_plugin('river', $site->getGUID());
- enable_plugin('updateclient', $site->getGUID());
- enable_plugin('logbrowser', $site->getGUID());
- enable_plugin('diagnostics', $site->getGUID());
- enable_plugin('uservalidationbyemail', $site->getGUID());
-
+ if (isset($CONFIG->default_plugins))
+ {
+ $plugins = explode(',', $CONFIG->default_plugins);
+ foreach ($plugins as $plugin)
+ enable_plugin(trim($plugins), $site->getGUID());
+ }
+ else
+ {
+ enable_plugin('profile', $site->getGUID());
+ enable_plugin('river', $site->getGUID());
+ enable_plugin('updateclient', $site->getGUID());
+ enable_plugin('logbrowser', $site->getGUID());
+ enable_plugin('diagnostics', $site->getGUID());
+ enable_plugin('uservalidationbyemail', $site->getGUID());
+ }
+
// Now ping home
if ($usage)
{