From 97b47294fe522e4a0a524ca5d8f0a937557934b7 Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Thu, 11 Dec 2008 06:46:28 -0500
Subject: [PATCH] Merge all language in mail module
---
server/lib/classes/plugins.inc.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index 63c8cb9..8d016d2 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -34,13 +34,16 @@
var $subscribed_events = array();
/*
- This function is called to load the plugins from the plugins-available folder
+ This function is called to load the plugins from the plugins-enabled or the plugins-core folder
*/
- function loadPlugins() {
+ function loadPlugins($type) {
global $app,$conf;
+
+ $subPath = 'plugins-enabled';
+ if ($type == 'core') $subPath = 'plugins-core';
- $plugins_dir = $conf["rootpath"].$conf["fs_div"]."plugins-enabled".$conf["fs_div"];
+ $plugins_dir = $conf["rootpath"].$conf["fs_div"].$subPath.$conf["fs_div"];
$tmp_plugins = array();
if (is_dir($plugins_dir)) {
--
Gitblit v1.9.1