valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove option ALLOW_DUPLICATE_POSTS as confusing/useless

This commit is contained in:
Andrew Dolgov 2016-01-07 22:01:35 +03:00
parent 4f186b1f10
commit 5bdcb8fd78
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/pref/prefs.php
View File

@ -164,7 +164,7 @@ class Pref_Prefs extends Handler_Protected {
global $access_level_names; 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", "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT",
"FEEDS_SORT_BY_UNREAD"); "FEEDS_SORT_BY_UNREAD");

30
include/rssfuncs.php
View File

@ -750,25 +750,7 @@
db_query("UPDATE ttrss_entries SET date_updated = NOW() db_query("UPDATE ttrss_entries SET date_updated = NOW()
WHERE id = '$base_entry_id'"); WHERE id = '$base_entry_id'");
// if we allow duplicate posts, we have to continue to continue;
// 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;
}
} }
_debug("hash differs, applying plugin filters:", $debug_enabled); _debug("hash differs, applying plugin filters:", $debug_enabled);
@ -944,16 +926,8 @@
// check for user post link to main table // 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 $query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE
ref_id = '$ref_id' AND owner_uid = '$owner_uid' ref_id = '$ref_id' AND owner_uid = '$owner_uid'";
$dupcheck_qpart";
// if ($_REQUEST["xdebug"]) print "$query\n"; // if ($_REQUEST["xdebug"]) print "$query\n";