public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-25 16:47:10 +00:00
Code Issues Releases Wiki Activity

fix label cache being double escaped on save

Browse Source 
remove some old-style escaping
This commit is contained in:
Andrew Dolgov
2017-12-02 15:47:28 +03:00
parent 7a1872c1e0
commit e4befe6bf4
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/article.php
View File

@@ -976,12 +976,12 @@ class Article extends Handler_Protected {
$label_cache = $row["label_cache"];
if ($label_cache) {
$label_cache = json_decode($label_cache, true);
$tmp = json_decode($label_cache, true);
if ($label_cache["no-labels"] == 1)
if (!$tmp || $tmp["no-labels"] == 1)
return $rv;
else
return $label_cache;
return $tmp;
}
}

2
classes/labels.php
View File

@@ -62,7 +62,7 @@ class Labels
if (!$labels)
$labels = Article::get_article_labels($id);
$labels = db_escape_string(json_encode($labels));
$labels = json_encode($labels);
$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
label_cache = ? WHERE ref_id = ? AND owner_uid = ?");