From: Charlie Root <bvel@free.fr>
Date: Mon, 5 Nov 2012 15:36:47 +0000 (+0100)
Subject: Labels were cached without taking into account related owner
X-Git-Tag: 1.6.1~13
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=624d649f86b4a73f6a064e45224aa86cf94c9165;p=tt-rss.git

Labels were cached without taking into account related owner
---

diff --git a/include/functions.php b/include/functions.php
index 9edd2dd2..33a83b08 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3905,9 +3905,9 @@
 		}
 
 		if (count($rv) > 0)
-			label_update_cache($link, $id, $rv);
+			label_update_cache($link, $owner_uid, $id, $rv);
 		else
-			label_update_cache($link, $id, array("no-labels" => 1));
+			label_update_cache($link, $owner_uid, $id, array("no-labels" => 1));
 
 		return $rv;
 	}
@@ -3937,7 +3937,7 @@
 		return $rv;
 	}
 
-	function label_update_cache($link, $id, $labels = false, $force = false) {
+	function label_update_cache($link, $owner_uid, $id, $labels = false, $force = false) {
 
 		if ($force)
 			label_clear_cache($link, $id);
@@ -3948,7 +3948,7 @@
 		$labels = db_escape_string(json_encode($labels));
 
 		db_query($link, "UPDATE ttrss_user_entries SET
-			label_cache = '$labels' WHERE ref_id = '$id'");
+			label_cache = '$labels' WHERE ref_id = '$id' AND  owner_uid = '$owner_uid'");
 
 	}