From fd10614f5df59968234ed25f46a5c109eca953f6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 6 Dec 2018 08:29:32 +0300 Subject: [PATCH] labels: unfortunately we can't rely on caption to selectively clear label_cache (because of json unicode encoding) so clean it completely if label is updated --- classes/labels.php | 4 ++-- classes/pref/labels.php | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/classes/labels.php b/classes/labels.php index fd9e454bb..19d060617 100644 --- a/classes/labels.php +++ b/classes/labels.php @@ -163,8 +163,8 @@ class Labels /* Remove cached data */ $sth = $pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' - WHERE label_cache LIKE ? AND owner_uid = ?"); - $sth->execute(["%$caption%", $owner_uid]); + WHERE owner_uid = ?"); + $sth->execute([$owner_uid]); } diff --git a/classes/pref/labels.php b/classes/pref/labels.php index 498e593fd..0414a7f8e 100644 --- a/classes/pref/labels.php +++ b/classes/pref/labels.php @@ -144,13 +144,11 @@ class Pref_Labels extends Handler_Protected { $sth->execute([$fg, $bg, $id, $_SESSION['uid']]); } - $caption = Labels::find_caption($id, $_SESSION["uid"]); - /* Remove cached data */ $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' - WHERE label_cache LIKE ? AND owner_uid = ?"); - $sth->execute(["%$caption%", $_SESSION['uid']]); + WHERE owner_uid = ?"); + $sth->execute([$_SESSION['uid']]); } } @@ -163,13 +161,11 @@ class Pref_Labels extends Handler_Protected { AND owner_uid = ?"); $sth->execute([$id, $_SESSION['uid']]); - $caption = Labels::find_caption($id, $_SESSION["uid"]); - /* Remove cached data */ $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' - WHERE label_cache LIKE ? AND owner_uid = ?"); - $sth->execute(["%$caption%", $_SESSION['uid']]); + WHERE owner_uid = ?"); + $sth->execute([$_SESSION['uid']]); } }