Fixes #2784 #2842 installer uses new plugin system now

git-svn-id: http://code.elgg.org/elgg/trunk@7993 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 4 insertions, 5 deletions

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 7042f9811..d24d4ce65 100644
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -1326,12 +1326,11 @@ class ElggInstaller {
 	 * @return void
 	 */
 	protected function enablePlugins() {
-		// activate plugins with manifest.xml: elgg_install_state = enabled
-		$plugins = get_plugin_list();
+		$plugins = elgg_get_plugins('any');
 		foreach ($plugins as $plugin) {
-			if ($manifest = load_plugin_manifest($plugin)) {
-				if (isset($manifest['elgg_install_state']) && $manifest['elgg_install_state'] == 'enabled') {
-					enable_plugin($plugin);
+			if ($plugin->manifest) {
+				if ($plugin->manifest->getActivateOnInstall()) {
+					$plugin->activate();
 				}
 			}
 		}