(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 1da69b40dbf8fff12eaa111c1b55f154eb4110cf..67ce9e3ff81e1c8a923cb6d4155455f314707170 100644 (file)
--- 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');\r
 \r
 \r
-               if ($v1 || $v2) {\r
-                       fb(time(), 'Compile PDF & Widget');\r
-                       $this->compilePDF($book, $pages);\r
-                       $this->compileWidget($book, $pages);\r
-               }\r
+\r
                $res = '';\r
                if ($v1) {\r
                        fb(time(), 'Compile V1');\r
@@ -836,6 +832,12 @@ class wsDAOBook extends commonDAO {
                        $res.=$this->compileHTML5($book_id);\r
                        $this->touchCompile($book_id, 'html5');\r
                }\r
+                               if ($v1 || $v2) {\r
+                       fb(time(), 'Compile PDF & Widget');\r
+                       $this->compilePDF($book, $pages);\r
+                       $this->compileWidget($book, $pages);\r
+               }\r
+               \r
                fb(time(), 'End Compile');\r
                return $res;\r
        }\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 5673e912d338cf1812b4e1c7140a461679c865ae..ffba9ef1b26dd126e63b1f2d0c0778bd7652950e 100644 (file)
--- 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 {
        }\r
 \r
        protected function getSWFFiles() {\r
-               return array(WS_COMPILE_ASSETS . '/index.swf', WS_COMPILE_ASSETS . '/player.swf');\r
+               return array('index.swf', 'player.swf');\r
        }\r
 \r
        protected function preparePackage() {\r