.

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 5713948e46930ea8d059fb342615562590d36f51..583ffbbd2ea95803911647906914252bce35fd97 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -621,7 +621,7 @@ class wsFlash extends cubeFlashGateway
 
         $types = array(1, 2, 3, 4, 5, 6, 7, 11, 13, 14, 15, 16, 17, 18, 19, 24, 25);
         if (wsDroits::revendeur()) {
-            $types = array(1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 24, 25, 31, 33, 36, 40);
+            $types = array(1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 24, 25,26, 31, 33, 36, 40);
         }
         if (wsDroits::admin()) {
             $types = range(1, 100);

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 2dc74dbc80377773db9856f19ba0d284c67bac99..dc1518e7253bbd96b2c5a9ccd58ff24700ce5560 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -289,7 +289,7 @@ class wsHTML5Compiler
         $daoDoc = new wsDAODocument($core->con);
         $firstDoc = $daoDoc->selectById($this->pages[1]['document_id']);
         $firstDoc->checkInfos();
-        $size = $firstDoc->generalInfos['size'];
+        $size = $firstDoc->generalInfos['page'][$this->pages[1]['document_page']]['size'];
 
         $this->log('Got data from database');