From 17d97908d3e6d1c8a141364f9b4088d54d686394 Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 8 May 2009 13:29:14 +0000
Subject: 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
---
 actions/systemsettings/install.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actions/systemsettings')

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());
 			}
-- 
cgit v1.2.3