From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 18 Apr 2012 09:51:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=01d5e5b9261281d4f49e1216d3424a9b6892d189;p=cubeextranet.git

---

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 1da69b40d..67ce9e3ff 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -815,11 +815,7 @@ class wsDAOBook extends commonDAO {
 		$html5 = $html5 && !$this->isUpToDate($book, 'html5');
 
 
-		if ($v1 || $v2) {
-			fb(time(), 'Compile PDF & Widget');
-			$this->compilePDF($book, $pages);
-			$this->compileWidget($book, $pages);
-		}
+
 		$res = '';
 		if ($v1) {
 			fb(time(), 'Compile V1');
@@ -836,6 +832,12 @@ class wsDAOBook extends commonDAO {
 			$res.=$this->compileHTML5($book_id);
 			$this->touchCompile($book_id, 'html5');
 		}
+				if ($v1 || $v2) {
+			fb(time(), 'Compile PDF & Widget');
+			$this->compilePDF($book, $pages);
+			$this->compileWidget($book, $pages);
+		}
+		
 		fb(time(), 'End Compile');
 		return $res;
 	}
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 5673e912d..ffba9ef1b 100644
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -15,7 +15,7 @@ class wsPackagerHTML extends wsPackager {
 	}
 
 	protected function getSWFFiles() {
-		return array(WS_COMPILE_ASSETS . '/index.swf', WS_COMPILE_ASSETS . '/player.swf');
+		return array('index.swf', 'player.swf');
 	}
 
 	protected function preparePackage() {