From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/lib/classes/tform_tpl_generator.inc.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php
index 49fd274..f841a09 100644
--- a/interface/lib/classes/tform_tpl_generator.inc.php
+++ b/interface/lib/classes/tform_tpl_generator.inc.php
@@ -136,8 +136,8 @@
<input type=\"hidden\" name=\"id\" value=\"{tmpl_var name='id'}\">
<div class=\"buttonHolder buttons\">
- <button class=\"positive iconstxt icoPositive\" type=\"button\" value=\"{tmpl_var name='btn_save_txt'}\" onclick=\"submitForm('pageForm','".$module."/".$formDef["action"]."');\"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class=\"negative iconstxt icoNegative\" type=\"button\" value=\"{tmpl_var name='btn_cancel_txt'}\" onclick=\"loadContent('".$module."/".$formDef["list_default"]."');\"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class=\"positive iconstxt icoPositive\" type=\"button\" value=\"{tmpl_var name='btn_save_txt'}\" onclick=\"ISPConfig.submitForm('pageForm','".$module."/".$formDef["action"]."');\"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class=\"negative iconstxt icoNegative\" type=\"button\" value=\"{tmpl_var name='btn_cancel_txt'}\" data-load-content=\"".$module."/".$formDef["list_default"]."\"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
@@ -273,7 +273,7 @@
case 'DATE':
$type = 'date';
$typevalue = '';
- $defaultValue = ($field["default"] != '')?$field["default"]:'0000-00-00';
+ $defaultValue = ($field["default"] != '')?$field["default"]:null;
break;
}
@@ -311,6 +311,8 @@
$fp = fopen($lng_file, "w");
fwrite($fp, "<?php\n");
foreach($wb_out as $key => $val) {
+ $val = str_replace("'", "\\'",$val);
+ $key = str_replace("'", "\\'",$key);
$new_line = '$wb["'.$key.'"] = '."'$val';\n";
fwrite($fp, $new_line);
--
Gitblit v1.9.1