Fix operators init

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 9349d42c8308536cd15dce3ef84936d7cf3cb735..a178e3ae16600bd5e4780873df8dd92c9424f068 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -83,6 +83,7 @@ include "../adminer/drivers/mssql.inc.php";
 include "../adminer/drivers/mongo.inc.php";
 include "../adminer/drivers/elastic.inc.php";
 include "./include/adminer.inc.php";
+$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
 
 $config = driver_config();
@@ -95,6 +96,9 @@ $operators = $config['operators'];
 $functions = $config['functions'];
 $grouping = $config['grouping'];
 $edit_functions = $config['edit_functions'];
+if ($adminer->operators === null) {
+       $adminer->operators = $operators;
+}
 
 define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
 define("DB", $_GET["db"]); // for the sake of speed and size

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 96d27c47f3496fd621b7c996825e33ad289c72bb..e8fed7accfd9041e1a18698ecda4bcc1e9890f4f 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -658,5 +658,3 @@ qsl('div').onclick = whisperClick;", "")
        }
 
 }
-
-$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);