fix #2416 @1

diff --git a/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php b/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php
index b35462426f20b3929a55453cc2a6c5a9e28f324b..2e0ab85fc6e2e86c1113958d9b042d121a27a84f 100644 (file)
--- a/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php
@@ -706,7 +706,7 @@ class wsHTML5Compiler
                        if ($this->theme->parametres->iosicon != '') {
                                $hasIos = true;
                                $this->vdir->copy($this->themeRoot . '/' . $this->theme->parametres->iosicon, 'data/apple-touch-icon.png');
-                               $favicon .= '<link rel="apple-touch-icon" href="data/apple-touch-icon.png" />';
+                               $favicon .= '<link rel="apple-touch-icon" href="data/apple-touch-icon.png" />'."\n\t";
                        }
                        if ($this->theme->parametres->favicon != '') {
 
@@ -725,11 +725,16 @@ class wsHTML5Compiler
 
                                        unlink($tmp);
                                }
+
                                $this->vdir->copy($pngFile, 'data/favicon.png');
                                $this->vdir->copy($icoFile, 'data/favicon.ico');
-                               $favicon .= '<link rel="shortcut icon" href="data/favicon.ico" />';
-                               $favicon .= '<link rel="icon" type="image/vnd.microsoft.icon" href="data/favicon.ico" />';
-                               $favicon .= '<link rel="icon" type="image/png" href="data/favicon.png" />';
+
+                               $dataico = 'data:image/vnd.microsoft.icon;base64,' . base64_encode(file_get_contents($icoFile));
+                               $datapng = 'data:image/png;base64,' . base64_encode(file_get_contents($pngFile));
+
+                               $favicon .= '<link rel="shortcut icon" href="' . $dataico . '" />'."\n\t";
+                               $favicon .= '<link rel="icon" type="image/vnd.microsoft.icon" href="' . $dataico . '" />'."\n\t";
+                               $favicon .= '<link rel="icon" type="image/png" href="' . $datapng . '" />'."\n\t";
                                if (!$hasIos) {
                                        $favicon .= '<link rel="apple-touch-icon" href="data/favicon.png" />';
                                }