From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 13 Mar 2017 17:15:58 +0000 (+0000)
Subject: wip #1233 @0:15
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9e335bdc8fb9ff43cccdae230aa42a603208da2e;p=cubeextranet.git

wip #1233 @0:15
---

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
index 0dbe800ad..4da84c196 100644
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
@@ -1,27 +1,26 @@
 <?php
+
 class wsPackagerMacEXE extends wsPackager {
 	protected $exeName;
 
-	public function __construct($book_id)
-	{
+	public function __construct($book_id) {
 		parent::__construct($book_id);
 		$this->version = 'mac-exe';
+		$this->book->parametres->alwaysHTML5 = false;
 
 		$this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 30));
 	}
 
-	protected function preparePackage()
-	{
+	protected function preparePackage() {
 		parent::preparePackage();
 
 		$this->copyFluidbookFiles();
 		$this->copyOtherFiles(array('Fluidbook.app.zip'));
 	}
 
-	public function makePackage($zip)
-	{
+	public function makePackage($zip) {
 		parent::makePackage($zip);
-		$res=$this->zip($this->vdir . 'Fluidbook.app.zip');
+		$res = $this->zip($this->vdir . 'Fluidbook.app.zip');
 		$this->postPackage();
 		return $res;
 	}
diff --git a/inc/ws/Util/packager/class.ws.packager.win.cd.php b/inc/ws/Util/packager/class.ws.packager.win.cd.php
index 333648642..a21310e7b 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.cd.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.cd.php
@@ -4,6 +4,7 @@ class wsPackagerWinCD extends wsPackagerMacEXE {
 
 	public function __construct($book_id) {
 		parent::__construct($book_id);
+		$this->book->parametres->alwaysHTML5=false;
 		$this->version = 'win-cd';
 	}
 
diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.php b/inc/ws/Util/packager/class.ws.packager.win.exe.php
index d5d640e43..819c1a8e3 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.php
@@ -7,6 +7,7 @@ class wsPackagerWinEXE extends wsPackager {
 	public function __construct($book_id) {
 		parent::__construct($book_id);
 		$this->version = 'win-exe';
+		$this->book->parametres->alwaysHTML5=false;
 
 		if ($this->book->parametres->offlineTitle == "") {
 			$this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 30)) . '.exe';
@@ -29,6 +30,4 @@ class wsPackagerWinEXE extends wsPackager {
 		return $res;
 	}
 
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
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 010a1b7c4..e5f943394 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.php
@@ -7,6 +7,7 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 	public function __construct($book_id) {
 		parent::__construct($book_id);
 		$this->version = 'win-ins';
+		$this->book->parametres->alwaysHTML5 = false;
 	}
 
 	protected function preparePackage() {