wait #5241 @0.25

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 21d031900fae3a702485a5e3277b47ce16953d64..dc87a8074ac01a7dd51636f09c2fe8861fcf7b1e 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1031,9 +1031,9 @@ class wsHTML5Compiler
             $this->config->tagcommander_default_vars = array_merge($default, $this->parseVariables($this->book->parametres->tagcommander_default_vars));
             $this->config->tagcommander_default_vars['env_work'] = $this->book->parametres->tagcommander_prod ? 'prod' : 'pre-prod';
 
-            $scriptNames=explode(',', $this->config->tagcommander_scriptname);
-            $this->book->parametres->googleAnalyticsCustom .= '<script>window.tc_vars=' . json_encode($this->config->tagcommander_default_vars) . ';</script><script src="//cdn.tagcommander.com/' . $id . '/' .$scriptNames[0] . '"></script>';
-            for($i=1;$i<count($scriptNames);$i++) {
+            $scriptNames = explode(',', $this->config->tagcommander_scriptname);
+            $this->book->parametres->googleAnalyticsCustom .= '<script>window.tc_vars=' . json_encode($this->config->tagcommander_default_vars) . ';</script><script src="//cdn.tagcommander.com/' . $id . '/' . $scriptNames[0] . '"></script>';
+            for ($i = 1; $i < count($scriptNames); $i++) {
                 $this->book->parametres->statsCustom .= '<script src="//cdn.tagcommander.com/' . $id . '/' . $scriptNames[$i] . '"></script>';
             }
 
@@ -2042,7 +2042,10 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
 
         foreach ($linksCopy as $k => $linkData) {
-            if ($this->book->parametres->PDFRendererIframe === 'svg' && $linkData['type'] == 31 && stristr($linkData['to'], '.pdf')) {
+            if ($this->book->parametres->PDFRendererIframe === 'svg' && (($linkData['type'] == 31 && stristr($linkData['to'], '.pdf')) || ($linkData['type'] == 6 && stristr($linkData['alternative'], '.pdf')))) {
+                if ($linkData['type'] == 6) {
+                    $linkData['to'] = $linkData['alternative'];
+                }
                 $ofile = $this->wdir . '/' . $linkData['to'];
                 $dfile = $this->wdir . '/' . $linkData['to'] . '.svg';
                 if (!file_exists($dfile) || filemtime($dfile) < filemtime($ofile)) {