2 files changed, 12 insertions, 43 deletions

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index e1e88ddc0..88c5b7f0e 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1607,54 +1607,23 @@ class Pref_Feeds extends Handler_Protected {
 
 			/* save starred articles in Archived feed */
 
-			/* prepare feed if necessary */
+			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+					feed_id = NULL, orig_feed_id = NULL
+				WHERE feed_id = ? AND marked = true AND owner_uid = ?");
 
-			$sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
-				AND owner_uid = ?");
 			$sth->execute([$id, $owner_uid]);
 
-			if ($row = $sth->fetch()) {
-				$feed_url = $row["feed_url"];
+			/* Remove access key for the feed */
 
-				$sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
-					WHERE feed_url = ? AND owner_uid = ?");
-				$sth->execute([$feed_url, $owner_uid]);
-
-				if ($row = $sth->fetch()) {
-					$archive_id = $row["id"];
-				} else {
-					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
-					$row = $res->fetch();
-
-					$new_feed_id = (int)$row['id'] + 1;
-
-					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
-						(id, owner_uid, title, feed_url, site_url, created)
-							SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
-							WHERE id = ?");
-					$sth->execute([$new_feed_id, $id]);
-
-					$archive_id = $new_feed_id;
-				}
-
-				$sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
-					orig_feed_id = ? WHERE feed_id = ? AND
-						marked = true AND owner_uid = ?");
-
-				$sth->execute([$archive_id, $id, $owner_uid]);
-
-				/* Remove access key for the feed */
-
-				$sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
-					feed_id = ? AND owner_uid = ?");
-				$sth->execute([$id, $owner_uid]);
+			$sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+				feed_id = ? AND owner_uid = ?");
+			$sth->execute([$id, $owner_uid]);
 
-				/* remove the feed */
+			/* remove the feed */
 
-				$sth = $pdo->prepare("DELETE FROM ttrss_feeds
-					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$id, $owner_uid]);
-			}
+			$sth = $pdo->prepare("DELETE FROM ttrss_feeds
+				WHERE id = ? AND owner_uid = ?");
+			$sth->execute([$id, $owner_uid]);
 
 			$pdo->commit();
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index bce3c171b..55a15efb8 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -911,7 +911,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		$tmppluginhost = new PluginHost();
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
-		$tmppluginhost->load_data(true);
+		//$tmppluginhost->load_data(true);
 
 		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
 			$about = $plugin->about();