From: Gargaj <gargaj@conspiracy.hu>
Date: Fri, 5 Sep 2014 23:08:13 +0000 (+0200)
Subject: Elasticsearch: only throw error on actual decoding error
X-Git-Tag: v4.2.0~55
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=7066325e41da5588bb8fa3e67dda59cb1cbd7fde;p=adminer.git

Elasticsearch: only throw error on actual decoding error
---

diff --git a/adminer/drivers/elastic.inc.php b/adminer/drivers/elastic.inc.php
index 33da2d33..a529debf 100644
--- a/adminer/drivers/elastic.inc.php
+++ b/adminer/drivers/elastic.inc.php
@@ -31,7 +31,7 @@ if (isset($_GET["elastic"])) {
 					return false;
 				}
 				$return = json_decode($file, true);
-				if (!$return) {
+				if ($return === null) {
 					$this->errno = json_last_error();
 					if (function_exists('json_last_error_msg')) {
 						$this->error = json_last_error_msg();