From 5bdcb8fd7834964d69550a788d9c666c14964f21 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 7 Jan 2016 22:01:35 +0300 Subject: [PATCH] remove option ALLOW_DUPLICATE_POSTS as confusing/useless --- classes/pref/prefs.php | 2 +- include/rssfuncs.php | 30 ++---------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 9cbc425c..b78aa4d6 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -164,7 +164,7 @@ class Pref_Prefs extends Handler_Protected { global $access_level_names; - $prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES", + $prefs_blacklist = array("ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES", "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT", "FEEDS_SORT_BY_UNREAD"); diff --git a/include/rssfuncs.php b/include/rssfuncs.php index cd82481b..ad956cd2 100755 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -750,25 +750,7 @@ db_query("UPDATE ttrss_entries SET date_updated = NOW() WHERE id = '$base_entry_id'"); - // if we allow duplicate posts, we have to continue to - // create the user entries for this feed (if needed) - if (get_pref("ALLOW_DUPLICATE_POSTS", $owner_uid, false)) { - - $query = "SELECT int_id FROM ttrss_user_entries WHERE - ref_id = '$base_entry_id' AND owner_uid = '$owner_uid' - AND (feed_id = '$feed' OR feed_id IS NULL) LIMIT 1"; - - $result = db_query($query); - - if (db_num_rows($result) == 0) { - _debug("allow duplicate posts is enabled and user record is not found, continuing."); - } else { - continue; - } - - } else { - continue; - } + continue; } _debug("hash differs, applying plugin filters:", $debug_enabled); @@ -944,16 +926,8 @@ // check for user post link to main table - // do we allow duplicate posts with same GUID in different feeds? - if (get_pref("ALLOW_DUPLICATE_POSTS", $owner_uid, false)) { - $dupcheck_qpart = "AND (feed_id = '$feed' OR feed_id IS NULL)"; - } else { - $dupcheck_qpart = ""; - } - $query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE - ref_id = '$ref_id' AND owner_uid = '$owner_uid' - $dupcheck_qpart"; + ref_id = '$ref_id' AND owner_uid = '$owner_uid'"; // if ($_REQUEST["xdebug"]) print "$query\n"; -- 2.39.5