From 369bac525bda0afdf80718d306f9047521ade953 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 6 Dec 2018 16:42:21 +0300
Subject: simplify zoom mode display

---
 classes/article.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'classes/article.php')

diff --git a/classes/article.php b/classes/article.php
index 4b18280d4..091caa735 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -771,7 +771,7 @@ class Article extends Handler_Protected {
 
 			/* originally from */
 
-			if ($line["orig_feed_id"]) {
+			if (!$zoom_mode && $line["orig_feed_id"]) {
 
 				$of_sth = $pdo->prepare("SELECT * FROM ttrss_archived_feeds
 					WHERE id = ? AND owner_uid = ?");
@@ -813,14 +813,6 @@ class Article extends Handler_Protected {
 
 		}
 
-		if ($zoom_mode) {
-			$rv['content'] .= "
-				<div class='footer'>
-				<button onclick=\"return window.close()\">".
-				__("Close this window")."</button></div>";
-			$rv['content'] .= "</body></html>";
-		}
-
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
 			$rv['content'] = $p->hook_format_article($rv['content'], $line, $zoom_mode);
 		}
-- 
cgit v1.2.3