remove local file extensions and generalize some method names for cached media

[tt-rss.git] / include / functions2.php

diff --git a/include/functions2.php b/include/functions2.php
index 34f027a5558354f43df562e7ef7222cb97c1fbbd..39c7f746b6e0b01d8eb84b46826333b3474c2b75 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -913,11 +913,11 @@
                                // check cache only for video and images for the time being
                                if ($entry->nodeName == 'img' || ($entry->parentNode && $entry->parentNode->nodeName == "video")) {
 
+                                       $cached_filename = CACHE_DIR . '/images/' . sha1($src);
                                        $extension = $entry->tagName == 'source' ? '.mp4' : '.png';
-                                       $cached_filename = CACHE_DIR . '/images/' . sha1($src) . $extension;
 
                                        if (file_exists($cached_filename)) {
-                                               $src = get_self_url_prefix() . '/public.php?op=cached_image&hash=' . sha1($src) . $extension;
+                                               $src = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($src) . $extension;
 
                                                if ($entry->hasAttribute('srcset')) {
                                                        $entry->removeAttribute('srcset');