From e4befe6bf43318766bcfd5a610b26be0aa1f82f0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 2 Dec 2017 15:47:28 +0300
Subject: fix label cache being double escaped on save remove some old-style
 escaping

---
 classes/article.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'classes/article.php')

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;
 			}
 		}
 
-- 
cgit v1.2.3-54-g00ecf