From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 18 Dec 2018 12:03:00 +0000 (+0000)
Subject: fix #2447 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=240735471da70191bf6a92613d9576068bc405b5;p=cubeextranet.git

fix #2447 @0.5
---

diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.html.php b/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
index 5d99ed15a..3374e69db 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
@@ -36,12 +36,12 @@ class wsPackagerWinINSTHTML extends wsPackagerWinEXEHTML {
 		$title = $this->appName;
 
 		$nsi = file_get_contents(WS_COMPILE_ASSETS . '/' . $this->nsifile . '.nsi');
-		$nsi = str_replace('$name', utf8_decode($title), $nsi);
-		$nsi = str_replace('$htmldir', utf8_decode(WS_COMPILE_ASSETS), $nsi);
+		$nsi = str_replace('$name', $title, $nsi);
+		$nsi = str_replace('$htmldir', WS_COMPILE_ASSETS, $nsi);
 		$nsi = str_replace('$fname', $fname, $nsi);
 		$nsi = str_replace('$fdir', $winvdir, $nsi);
-		$nsi = str_replace('$titre', utf8_decode($title), $nsi);
-		$nsi = str_replace('$lang', utf8_decode($lang->nsis), $nsi);
+		$nsi = str_replace('$titre', $title, $nsi);
+		$nsi = str_replace('$lang', $lang->nsis, $nsi);
 		$nsi = str_replace('$nwplatform', $this->nwplatform, $nsi);
 		$nsi = str_replace('$nsisdir', '/usr/share/nsis', $nsi);
 		$nsi = str_replace('$output', $this->getPathBase('exe'), $nsi);
diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.php b/inc/ws/Util/packager/class.ws.packager.win.inst.php
index 8c4855bde..a0ec943e9 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.php
@@ -1,16 +1,19 @@
 <?php
 
-class wsPackagerWinINST extends wsPackagerWinEXE {
+class wsPackagerWinINST extends wsPackagerWinEXE
+{
 
 	protected $nsi;
 
-	public function __construct($book_id) {
+	public function __construct($book_id)
+	{
 		parent::__construct($book_id);
 		$this->version = 'win-ins';
 		$this->book->parametres->alwaysHTML5 = false;
 	}
 
-	protected function preparePackage() {
+	protected function preparePackage()
+	{
 		parent::preparePackage();
 
 		$this->copyFluidbookFiles();
@@ -19,7 +22,8 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 		$this->makeNSI();
 	}
 
-	protected function makeNSI() {
+	protected function makeNSI()
+	{
 		global $core;
 
 		$winvdir = trim($this->vdir, '/');
@@ -42,12 +46,12 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 		$title = $this->book->parametres->offlineTitle == '' ? $this->book->parametres->title : $this->book->parametres->offlineTitle;
 
 		$nsi = file_get_contents(WS_COMPILE_ASSETS . '/script.nsi');
-		$nsi = str_replace('$name', utf8_decode($title), $nsi);
-		$nsi = str_replace('$htmldir', utf8_decode(WS_COMPILE_ASSETS), $nsi);
+		$nsi = str_replace('$name', $title, $nsi);
+		$nsi = str_replace('$htmldir', WS_COMPILE_ASSETS, $nsi);
 		$nsi = str_replace('$fname', $fname, $nsi);
 		$nsi = str_replace('$fdir', $winvdir, $nsi);
-		$nsi = str_replace('$titre', utf8_decode($title), $nsi);
-		$nsi = str_replace('$lang', utf8_decode($lang->nsis), $nsi);
+		$nsi = str_replace('$titre', $title, $nsi);
+		$nsi = str_replace('$lang', $lang->nsis, $nsi);
 		$nsi = str_replace('$nsisdir', '/usr/share/nsis', $nsi);
 		$nsi = str_replace('$output', $this->getPathBase('exe'), $nsi);
 		$favicon = $this->vdir . '/data/fluidbook.ico';
@@ -59,7 +63,8 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 		$this->nsi = $nsi;
 	}
 
-	public function makePackage($zip) {
+	public function makePackage($zip)
+	{
 		$this->preparePackage();
 
 		$tmp = cubeFiles::tempnam();
@@ -72,7 +77,8 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 		return $this->getURLBase('exe');
 	}
 
-	public function __destruct() {
+	public function __destruct()
+	{
 
 	}