From dea284f5715c8efda8a450ca8fffee6d8e78e83a Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Tue, 18 Nov 2008 16:43:38 -0500
Subject: [PATCH] Improved merge in language editor: - Remove of the file how not exists in master language - Fix the msg show when no file has been created, removed or modified
---
server/lib/config.inc.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/lib/config.inc.php b/server/lib/config.inc.php
index 8ecfa81..062a52b 100644
--- a/server/lib/config.inc.php
+++ b/server/lib/config.inc.php
@@ -32,8 +32,7 @@
-//$conf["rootpath"] = "F:\\server\\www\\ispconfig3\\server";
-$conf["rootpath"] = "D:\\www\\ispconfig3\\server";
+$conf["rootpath"] = "D:\\server\\www\\ispconfig3\\server";
//$conf["rootpath"] = "/home/www/ispconfig3/web/cms";
$conf["fs_div"] = "/"; // File system divider, \\ on windows and / on linux and unix
@@ -45,8 +44,7 @@
*/
$conf["log_file"] = $conf["rootpath"].$conf["fs_div"]."ispconfig.log";
-$conf["log_priority"] = 0 // 0 = Debug, 1 = Warning, 2 = Error
-
+$conf["log_priority"] = 0; // 0 = Debug, 1 = Warning, 2 = Error
/*
Database Settings
@@ -66,4 +64,9 @@
$conf["load_server_config"] = true;
+
+define("LOGLEVEL_DEBUG",0);
+define("LOGLEVEL_WARN",1);
+define("LOGLEVEL_ERROR",2);
+
?>
\ No newline at end of file
--
Gitblit v1.9.1