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/tform_actions.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php
index 023595e..812c792 100644
--- a/interface/lib/classes/tform_actions.inc.php
+++ b/interface/lib/classes/tform_actions.inc.php
@@ -168,7 +168,7 @@
function onUpdateSave($sql) {
global $app;
- if(!empty($sql)) {
+ if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab())) {
$app->db->query($sql);
if($app->db->errorMessage != '') die($app->db->errorMessage);
}
--
Gitblit v1.9.1