From: vincent@cubedesigners.com Date: Tue, 24 Nov 2020 10:09:15 +0000 (+0000) Subject: wait #4093 @0:10 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=93ae09e49c8bf2f23926cd45fbde3eace6236527;p=cubeextranet.git wait #4093 @0:10 --- diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php index f5cc634b6..d64a05f4e 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.links.php +++ b/inc/ws/Util/html5/master/class.ws.html5.links.php @@ -2355,9 +2355,9 @@ class slideshowLink extends normalLink public function generateSlideshow($context) { - $this->compiler->addSlideshowLibrary($context==='inline'); + $this->compiler->addSlideshowLibrary($context === 'inline'); - $this->allowed_extensions = ['jpg', 'png', 'jpeg', 'gif']; + $this->allowed_extensions = ['jpg', 'png', 'jpeg', 'gif', 'svg']; $slideshowID = 'slideshow_' . $this->uid; $XML_path = $this->path_absolute . '/slideshow.xml'; // Optional file so it may not exist @@ -2430,7 +2430,7 @@ class slideshowLink extends normalLink } $lib = $context === 'popup' ? $this->compiler->book->parametres->popupSlideshowLibrary : $this->compiler->book->parametres->inlineSlideshowLibrary; - $res = '
' . $res . '
'; + $res = '
' . $res . '
'; return $res; } @@ -2475,7 +2475,7 @@ class slideshowLink extends normalLink foreach ($slides as $slide) { $image_path_relative = $this->compiler->vdir->relativePath($slide['path']); - $image_info = getimagesize($slide['path']); + $image_info = CubeIT_Image::getimagesize($slide['path']); $image_info_json = ($image_info) ? json_encode(['width' => $image_info[0], 'height' => $image_info[1], 'ratio' => round($image_info[0] / $image_info[1], 4)]) : ''; $image_dimensions = ($image_info) ? $image_info[3] : '';