aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-12-07 20:14:18 +0100
committerMario <mario@mariovavti.com>2019-12-07 20:14:18 +0100
commit593688d5390417564f393dd326bbcc5dd0bf8d16 (patch)
treea022f3769332331a9c30f4b96a81a6b854690767 /Zotlabs/Module
parent96f9e515466b749d1e1640aad3fd25bc19399f1a (diff)
parentaed682305173a67b2af1a56b8595445bec690e2b (diff)
downloadvolse-hubzilla-593688d5390417564f393dd326bbcc5dd0bf8d16.tar.gz
volse-hubzilla-593688d5390417564f393dd326bbcc5dd0bf8d16.tar.bz2
volse-hubzilla-593688d5390417564f393dd326bbcc5dd0bf8d16.zip
Merge branch 'dev' into 'dev'
Add .webp image format support See merge request hubzilla/core!1802
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Embedphotos.php2
-rw-r--r--Zotlabs/Module/Help.php5
2 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php
index 6a88513dc..9b0884197 100644
--- a/Zotlabs/Module/Embedphotos.php
+++ b/Zotlabs/Module/Embedphotos.php
@@ -68,6 +68,8 @@ class Embedphotos extends \Zotlabs\Web\Controller {
$ext = '.png';
elseif($r[0]['mimetype'] === 'image/gif')
$ext = '.gif';
+ elseif($r[0]['mimetype'] === 'image/webp')
+ $exp = '.webp';
else
$ext = EMPTY_STR;
diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php
index f1b1acaef..ce05035b3 100644
--- a/Zotlabs/Module/Help.php
+++ b/Zotlabs/Module/Help.php
@@ -66,7 +66,10 @@ class Help extends \Zotlabs\Web\Controller {
case IMAGETYPE_PNG:
header("Content-Type: image/png");
break;
- default:
+ case IMAGETYPE_WEBP:
+ header("Content-Type: image/webp");
+ break;
+ default:
break;
}
header("Content-Length: " . filesize($realpath));