From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 22 Jan 2019 13:40:47 +0000 (+0000)
Subject: fix #2533 @0:10
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9145354fdd63a02d0f1b50043a661cb3569b63ed;p=cubeextranet.git

fix #2533 @0:10
---

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 423a6a4aa..79139d789 100644
--- a/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php
@@ -723,31 +723,11 @@ class wsHTML5Compiler
 				$favicon .= '<link rel="apple-touch-icon" href="data/apple-touch-icon.png" />' . "\n\t";
 			}
 			if ($this->theme->parametres->favicon != '') {
-
 				$pngFile = $this->themeRoot . '/' . $this->theme->parametres->favicon;
-				$icoFile = $this->themeRoot . '/favicon.ico';
-				if (!file_exists($icoFile) || filemtime($icoFile) < filemtime($pngFile) || filemtime(__FILE__) > filemtime($icoFile)) {
-					$tmp = CubeIT_Files::tempnam() . '.png';
-					$convert = "convert $pngFile -resize 64x64^ -gravity center $tmp";
-					`$convert`;
-
-					$icotool = new cubeCommandLine('icotool');
-					$icotool->setArg('c');
-					$icotool->setArg('o', $icoFile);
-					$icotool->setArg(null, $tmp);
-					$icotool->execute();
-
-					unlink($tmp);
-				}
 
 				$this->vdir->copy($pngFile, 'data/favicon.png');
-				$this->vdir->copy($icoFile, 'data/favicon.ico');
-
-				$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" />';