From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 4 May 2018 13:24:01 +0000 (+0200)
Subject: Document that Elasticsearch requires allow_url_fopen
X-Git-Tag: v4.6.3~25
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=75f43a44540183a937decf0299ca36129783939e;p=adminer.git

Document that Elasticsearch requires allow_url_fopen
---

diff --git a/adminer/drivers/elastic.inc.php b/adminer/drivers/elastic.inc.php
index 00f325ac..e0dcbe0c 100644
--- a/adminer/drivers/elastic.inc.php
+++ b/adminer/drivers/elastic.inc.php
@@ -2,10 +2,10 @@
 $drivers["elastic"] = "Elasticsearch (beta)";
 
 if (isset($_GET["elastic"])) {
-	$possible_drivers = array("json");
+	$possible_drivers = array("json + allow_url_fopen");
 	define("DRIVER", "elastic");
 
-	if (function_exists('json_decode')) {
+	if (function_exists('json_decode') && ini_bool('allow_url_fopen')) {
 		class Min_DB {
 			var $extension = "JSON", $server_info, $errno, $error, $_url;