From fe84dae313a21598882d52f3f36923b99180470c Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Wed, 24 Apr 2019 11:18:17 +0200
Subject: Optimize cached photos processing

---
 Zotlabs/Module/Photo.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'Zotlabs/Module/Photo.php')

diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 74b2ef45d..30670c329 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -162,18 +162,20 @@ class Photo extends \Zotlabs\Web\Controller {
 							$allowed = (-1);
 					if($u === PHOTO_CACHE) {
 						// Validate cache
-						$cache = array(
-							'resid' => $photo,
-							'status' => false
-						);
-						if($cache_mode['on'])
+						if($cache_mode['on']) {
+							$cache = array(
+								'resid' => $photo,
+								'status' => false
+							);
 							call_hooks('cache_url_hook', $cache);
-						if(! $cache['status']) {
-							$url = htmlspecialchars_decode($r[0]['display_path']);
-							if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
-								$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);
-							header("Location: " . $url);
-							killme();
+							if(! $cache['status']) {
+								$url = htmlspecialchars_decode($r[0]['display_path']);
+								// SSLify if needed
+								if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
+									$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);
+								header("Location: " . $url);
+								killme();
+							}
 						}
 					}
 				}
-- 
cgit v1.2.3