add a hack to prevent loading of stuff for hidden content in unexpanded combined...

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

diff --git a/include/functions.php b/include/functions.php
index a055d1edf2f945fc95c24f9486cd5f57920a2926..66054c23b0346d39bde062f5e7f63dbbb9cdbbd2 100644 (file)
--- 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)) {