fix label cache being double escaped on save

remove some old-style escaping

2 files changed, 4 insertions, 4 deletions

diff --git a/classes/article.php b/classes/article.php
index 50367c08d..869e746cf 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -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;
 			}
 		}
 
diff --git a/classes/labels.php b/classes/labels.php
index 973732b99..4061de57e 100644
--- a/classes/labels.php
+++ b/classes/labels.php
@@ -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 = ?");