wip #4592 @2

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index faf1aa98e3bf8abc8c8b24be6d8cdef4baa05e5d..2578178cc3db3a89dca0ac80f9c30f4a9ec36908 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -622,6 +622,7 @@ class commonTools
         $uglify->setArg('c');
         $uglify->setArg('m');
         $uglify->execute();
+
         ob_end_clean();
 
         header('Content-type: text/javascript');

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 90a5772f041201d569281081b9e337624821e0ac..e620449678e673d5dc8c6f24a9d4b1e4f96ed59e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1237,7 +1237,7 @@ html,body{height:100%;cursor: wait;font-family: "Open Sans", Arial;background-co
         }
 
         $id = $book_id;
-        if ($forceTheme) {
+        if ($forceTheme && strpos($id, '-') === false) {
             $id .= '-' . $forceTheme;
         }
 

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 700573092d09fb8025923d38eb6c82774a7fd745..1113c20bacceb0b8e79b57bbeb1f0cc2f42a5945 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -243,6 +243,7 @@ class wsHTML5Compiler
         $this->version = $version;
 
 
+
         if ($version == 'stable') {
             $this->assets = WS_COMPILE_ASSETS . '/player/branches/master';
         } else if ($version == 'dev') {
@@ -252,6 +253,7 @@ class wsHTML5Compiler
             $this->assets = WS_COMPILE_ASSETS . '/player/' . ($location == 'git' ? 'branches' : $location) . '/' . $branch;
         }
 
+
         $this->phonegap = $phonegap;
         $this->standalone = $standalone || $this->phonegap;
         $this->appcache = $appcache;
@@ -267,7 +269,7 @@ class wsHTML5Compiler
 
         if (is_null($dir)) {
             $id = $book_id;
-            if ($forceTheme) {
+            if ($forceTheme && strpos($id, '-') === false) {
                 $id .= '-' . $forceTheme;
             }
             $this->dir = WS_BOOKS . '/html5/' . $id . '/';
@@ -2098,6 +2100,8 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                     unlink($minimized);
                 }
 
+
+
                 if (file_exists($tmp) && filesize($tmp) > 0) {
                     if ($hasNonMin) {
                         $uglify = new CubeIT_CommandLine('/usr/local/bin/uglifyjs');