summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-03-20 13:17:48 +0400
committerAndrew Dolgov <[email protected]>2013-03-20 13:17:48 +0400
commitf0540b598a40c03882dc1af6c4b95256bb27cb1a (patch)
tree6e9631071d9b0fa0ebd2b8d0d96c5731d71f53d4 /include
parent81153e6b8bdf3761ebe805ae9622a305d001a786 (diff)
add a hack to prevent loading of stuff for hidden content in unexpanded combined mode (refs #602)
Diffstat (limited to 'include')
-rw-r--r--include/functions.php5
1 files changed, 3 insertions, 2 deletions
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)) {