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
---
interface/lib/classes/db_mysql.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index ca3b38c..8084443 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -250,10 +250,10 @@
}
} elseif(is_array($record_new)) {
foreach($record_new as $key => $val) {
- if(isset($record_new[$key]) && $record_old[$key] != $val) {
+ if(isset($record_new[$key]) && @$record_old[$key] != $val) {
// Record has changed
$diffrec_full['new'][$key] = $val;
- $diffrec_full['old'][$key] = $record_old[$key];
+ $diffrec_full['old'][$key] = @$record_old[$key];
$diff_num++;
} else {
$diffrec_full['new'][$key] = $val;
--
Gitblit v1.9.1