From f0540b598a40c03882dc1af6c4b95256bb27cb1a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Mar 2013 13:17:48 +0400
Subject: add a hack to prevent loading of stuff for hidden content in
 unexpanded combined mode (refs #602)

---
 include/functions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index a055d1edf..66054c23b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2609,7 +2609,8 @@
 				}
 
 				if ($entry->nodeName == 'img') {
-					if (get_pref($link, "STRIP_IMAGES", $owner) || $force_remove_images) {
+					if (($owner && get_pref($link, "STRIP_IMAGES", $owner)) ||
+							$force_remove_images) {
 
 						$p = $doc->createElement('p');
 
@@ -3633,7 +3634,7 @@
 				array_push($entries, $entry);
 			}
 
-			if (!get_pref($link, "STRIP_IMAGES")) {
+			if ($_SESSION['uid'] && !get_pref($link, "STRIP_IMAGES")) {
 				if ($always_display_enclosures ||
 							!preg_match("/<img/i", $article_content)) {
 
-- 
cgit v1.2.3