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 5d99ed15af80bd753e47eb0fefb8bfa913d0faa3..3374e69db2261b29e01eac66375602eee777ff9b 100644 (file)
--- 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;\r
 \r
                $nsi = file_get_contents(WS_COMPILE_ASSETS . '/' . $this->nsifile . '.nsi');\r
-               $nsi = str_replace('$name', utf8_decode($title), $nsi);\r
-               $nsi = str_replace('$htmldir', utf8_decode(WS_COMPILE_ASSETS), $nsi);\r
+               $nsi = str_replace('$name', $title, $nsi);\r
+               $nsi = str_replace('$htmldir', WS_COMPILE_ASSETS, $nsi);\r
                $nsi = str_replace('$fname', $fname, $nsi);\r
                $nsi = str_replace('$fdir', $winvdir, $nsi);\r
-               $nsi = str_replace('$titre', utf8_decode($title), $nsi);\r
-               $nsi = str_replace('$lang', utf8_decode($lang->nsis), $nsi);\r
+               $nsi = str_replace('$titre', $title, $nsi);\r
+               $nsi = str_replace('$lang', $lang->nsis, $nsi);\r
                $nsi = str_replace('$nwplatform', $this->nwplatform, $nsi);\r
                $nsi = str_replace('$nsisdir', '/usr/share/nsis', $nsi);\r
                $nsi = str_replace('$output', $this->getPathBase('exe'), $nsi);\r

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 8c4855bde2aef89091e5256c3a94f2ee9b0d38b9..a0ec943e9d36b1fac522fc6127b8d1e4e7bd7b7d 100644 (file)
--- 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\r
 \r
-class wsPackagerWinINST extends wsPackagerWinEXE {\r
+class wsPackagerWinINST extends wsPackagerWinEXE\r
+{\r
 \r
        protected $nsi;\r
 \r
-       public function __construct($book_id) {\r
+       public function __construct($book_id)\r
+       {\r
                parent::__construct($book_id);\r
                $this->version = 'win-ins';\r
                $this->book->parametres->alwaysHTML5 = false;\r
        }\r
 \r
-       protected function preparePackage() {\r
+       protected function preparePackage()\r
+       {\r
                parent::preparePackage();\r
 \r
                $this->copyFluidbookFiles();\r
@@ -19,7 +22,8 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
                $this->makeNSI();\r
        }\r
 \r
-       protected function makeNSI() {\r
+       protected function makeNSI()\r
+       {\r
                global $core;\r
 \r
                $winvdir = trim($this->vdir, '/');\r
@@ -42,12 +46,12 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
                $title = $this->book->parametres->offlineTitle == '' ? $this->book->parametres->title : $this->book->parametres->offlineTitle;\r
 \r
                $nsi = file_get_contents(WS_COMPILE_ASSETS . '/script.nsi');\r
-               $nsi = str_replace('$name', utf8_decode($title), $nsi);\r
-               $nsi = str_replace('$htmldir', utf8_decode(WS_COMPILE_ASSETS), $nsi);\r
+               $nsi = str_replace('$name', $title, $nsi);\r
+               $nsi = str_replace('$htmldir', WS_COMPILE_ASSETS, $nsi);\r
                $nsi = str_replace('$fname', $fname, $nsi);\r
                $nsi = str_replace('$fdir', $winvdir, $nsi);\r
-               $nsi = str_replace('$titre', utf8_decode($title), $nsi);\r
-               $nsi = str_replace('$lang', utf8_decode($lang->nsis), $nsi);\r
+               $nsi = str_replace('$titre', $title, $nsi);\r
+               $nsi = str_replace('$lang', $lang->nsis, $nsi);\r
                $nsi = str_replace('$nsisdir', '/usr/share/nsis', $nsi);\r
                $nsi = str_replace('$output', $this->getPathBase('exe'), $nsi);\r
                $favicon = $this->vdir . '/data/fluidbook.ico';\r
@@ -59,7 +63,8 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
                $this->nsi = $nsi;\r
        }\r
 \r
-       public function makePackage($zip) {\r
+       public function makePackage($zip)\r
+       {\r
                $this->preparePackage();\r
 \r
                $tmp = cubeFiles::tempnam();\r
@@ -72,7 +77,8 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
                return $this->getURLBase('exe');\r
        }\r
 \r
-       public function __destruct() {\r
+       public function __destruct()\r
+       {\r
 \r
        }\r
 \r