From 4a80c57c50a474c57ba76eb75c1f01daf6e7f121 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 19 Feb 2014 15:42:52 +0400 Subject: remove some unused code reported by phpmd --- classes/article.php | 1 - 1 file changed, 1 deletion(-) (limited to 'classes/article.php') diff --git a/classes/article.php b/classes/article.php index 398132d12..f796bf630 100644 --- a/classes/article.php +++ b/classes/article.php @@ -30,7 +30,6 @@ class Article extends Handler_Protected { $id = $this->dbh->escape_string($_REQUEST["id"]); $cids = explode(",", $this->dbh->escape_string($_REQUEST["cids"])); $mode = $this->dbh->escape_string($_REQUEST["mode"]); - $omode = $this->dbh->escape_string($_REQUEST["omode"]); // in prefetch mode we only output requested cids, main article // just gets marked as read (it already exists in client cache) -- cgit v1.2.3-54-g00ecf From 7416305704c4f1637b6db30bc17910860d993b22 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 17 Jul 2014 00:39:13 +0400 Subject: fix sharebyurl identifying articles by link instead of special synthesized guid which caused feed entries overwriting shared entries if their link matched --- classes/article.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/article.php') diff --git a/classes/article.php b/classes/article.php index f796bf630..9aef107ec 100644 --- a/classes/article.php +++ b/classes/article.php @@ -107,7 +107,7 @@ class Article extends Handler_Protected { // only check for our user data here, others might have shared this with different content etc $result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE - link = '$url' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1"); + guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1"); if (db_num_rows($result) != 0) { $ref_id = db_fetch_result($result, 0, "id"); -- cgit v1.2.3-54-g00ecf