From c420e715c5bf53527b5828b0de3fa3b52bdff4d1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 13 Apr 2016 04:41:17 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/lib/classes/tform_tpl_generator.inc.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php
index 348ac52..f841a09 100644
--- a/interface/lib/classes/tform_tpl_generator.inc.php
+++ b/interface/lib/classes/tform_tpl_generator.inc.php
@@ -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