From fb3a98c0f06fb14a188e5a020936768fa04cb205 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 22 Oct 2010 06:24:31 -0400
Subject: [PATCH] Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093)

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

diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 0a6778e..fc2397c 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -127,10 +127,10 @@
 								break;
 						}
 							
-                            if (!fwrite($fp, date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
+                            if (!fwrite($fp, @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
                                 die('Unable to write to logfile.');
                             }
-				echo date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
+				echo @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
 				fclose($fp);
 
 					// Log to database

--
Gitblit v1.9.1