(no commit message)

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index 9090e2a7a91073f6e3428135be32ce01f83ffaf9..f1d155289fce4fdba093faf32dd38b1b14e3f718 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.v1.php
+++ b/inc/ws/Util/packager/class.ws.packager.v1.php
@@ -24,7 +24,7 @@ class wsPackagerV1 extends wsPackagerHTML {
        }
 
        protected function compile() {
-       
+               
        }
 
        protected function copyFluidbookFiles() {
@@ -94,6 +94,11 @@ class wsPackagerV1 extends wsPackagerHTML {
                                $link['left'] = $link['left'] + $this->size[0];
                        }
 
+                       if ($link['type'] == 4 && !$link['inline']) {
+                               $link['type'] = 1;
+                               $link['to'].='$' . $link['video_width'] . '$' . $link['video_height'];
+                       }
+
                        if ($link['type'] > 6) {
                                if ($link['type'] == 15) {
                                        $link['type'] = 6;
@@ -106,7 +111,7 @@ class wsPackagerV1 extends wsPackagerHTML {
                                $link['to'] = $this->__virtualToPhysical($link['to']);
                        }
 
-                       if ($this->_copyWorkingFile($link['to']) && !in_array($link['type'], array( 4, 6))) {
+                       if ($this->_copyWorkingFile($link['to']) && !in_array($link['type'], array(4, 6))) {
                                $link['to'] = 'data/' . $link['to'];
                        }
 
@@ -269,7 +274,7 @@ class wsPackagerV1 extends wsPackagerHTML {
        }
 
        protected function _copyWorkingFile($file, $dir = null) {
-               
+
                $e = explode("$", $file);
                $file = array_shift($e);
                if (is_null($dir)) {
@@ -278,7 +283,7 @@ class wsPackagerV1 extends wsPackagerHTML {
 
                $src = $this->workingDir . '/' . $file;
                if (file_exists($src) && is_file($src)) {
-                       $res= $this->copy($src, $dir . $file);
+                       $res = $this->copy($src, $dir . $file);
                        return $res;
                }
                return false;