Adapt to mapping structure

Mappings return a different structure actually:
http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/mapping-intro.html#_viewing_the_mapping

diff --git a/adminer/drivers/elastic.inc.php b/adminer/drivers/elastic.inc.php
index 6a143726d462c6d28e7ff288e3c4a91c248b0263..33da2d33ea79c71efe537eac4a6b8402a92d71a3 100644 (file)
--- a/adminer/drivers/elastic.inc.php
+++ b/adminer/drivers/elastic.inc.php
@@ -269,10 +269,14 @@ if (isset($_GET["elastic"])) {
 
        function fields($table) {
                global $connection;
-               $mapping = $connection->query("$table/_mapping");
+               $result = $connection->query("$table/_mapping");
                $return = array();
-               if ($mapping) {
-                       foreach ($mapping[$table]['properties'] as $name => $field) {
+               if ($result) {
+                       $mappings = $result[$table]['properties'];
+                       if (!$mappings) {
+                               $mappings = $result[$connection->_db]['mappings'][$table]['properties'];
+                       }
+                       foreach ($mappings as $name => $field) {
                                $return[$name] = array(
                                        "field" => $name,
                                        "full_type" => $field["type"],