From cc65688b3da3e16729a1f73dd50fd975bd1ff741 Mon Sep 17 00:00:00 2001
From: hellkat <hellkat@ispconfig3>
Date: Tue, 26 Mar 2013 00:43:51 -0400
Subject: [PATCH]     Merged revisions 3845-3876 and 3879-3918 from stable branch.

---
 server/lib/classes/plugins.inc.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index afef438..d13317e 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -43,7 +43,7 @@
 		global $app,$conf;
 
 		$subPath = 'plugins-enabled';
-		if ($type == 'core') $subPath = 'plugins-core';
+		//if ($type == 'core') $subPath = 'plugins-core';
 		
 		$plugins_dir = $conf['rootpath'].$conf['fs_div'].$subPath.$conf['fs_div'];
 		$tmp_plugins = array();

--
Gitblit v1.9.1