From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 18 Jan 2013 13:42:26 +0000 (+0400)
Subject: force separate data in ttrss_entries between users
X-Git-Tag: 1.7.0~52
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3a4c8973829af3a3fd02c11934b7d5ed27673306;p=tt-rss.git

force separate data in ttrss_entries between users
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 2f51febb..bc3cad70 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -411,20 +411,14 @@
 				if (!$entry_guid) $entry_guid = $item->get_link();
 				if (!$entry_guid) $entry_guid = make_guid_from_title($item->get_title());
 
-				if ($cache_content) {
-					$entry_guid = "ccache:$entry_guid";
-				}
-
-				if ($auth_login || $auth_pass) {
-					$entry_guid = "auth,$owner_uid:$entry_guid";
-				}
-
 				if ($debug_enabled) {
 					_debug("update_rss_feed: guid $entry_guid");
 				}
 
 				if (!$entry_guid) continue;
 
+				$entry_guid = "$owner_uid,$entry_guid";
+
 				$entry_timestamp = "";
 
 				$entry_timestamp = strtotime($item->get_date());