summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-03-23 15:22:00 +0300
committerAndrew Dolgov <[email protected]>2017-03-23 15:22:00 +0300
commitdc2c4b13d41d0e243a4da3ef4534de3cb645ec89 (patch)
tree188fc3de62c446ef1bb617f0136f1928ddfa159c
parent388d4dfa88e843237ebe57e9a0376d0cd58c0f51 (diff)
when choosing enclosures to embed or rewrite (af_zz_imgproxy) only use content type instead of "filename"-based hacks
-rw-r--r--include/functions2.php3
-rw-r--r--plugins/af_zz_imgproxy/init.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/include/functions2.php b/include/functions2.php
index e00a0ba13..28e182f8d 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -2000,8 +2000,7 @@
$rv .= $retval;
} else {
- if (preg_match("/image/", $entry["type"]) ||
- preg_match("/\.(jpe?g|png|gif|bmp)/i", $entry["filename"])) {
+ if (preg_match("/image/", $entry["type"])) {
if (!$hide_images) {
$encsize = '';
diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php
index e0ec2f174..a07ff5614 100644
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -23,7 +23,7 @@ class Af_Zz_ImgProxy extends Plugin {
}
function hook_enclosure_entry($enc) {
- if (preg_match("/image/", $enc["content_type"]) || preg_match("/\.(jpe?g|png|gif|bmp)$/i", $enc["filename"])) {
+ if (preg_match("/image/", $enc["content_type"])) {
$proxy_all = $this->host->get($this, "proxy_all");
$enc["content_url"] = $this->rewrite_url_if_needed($enc["content_url"], $proxy_all);