From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/lib/classes/tform_tpl_generator.inc.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php
index b759e51..f841a09 100644
--- a/interface/lib/classes/tform_tpl_generator.inc.php
+++ b/interface/lib/classes/tform_tpl_generator.inc.php
@@ -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