diff --git a/adminer/call.inc.php b/adminer/call.inc.php
index b87f9141..ee6aa0cc 100644
--- a/adminer/call.inc.php
+++ b/adminer/call.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["call"]);
 page_header(lang('Call') . ": " . h($PROCEDURE), $error);
 
diff --git a/adminer/check.inc.php b/adminer/check.inc.php
index 305748d1..d75b0be4 100644
--- a/adminer/check.inc.php
+++ b/adminer/check.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["check"];
 $name = $_GET["name"];
 $row = $_POST;
diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index a4c10907..bf109ed6 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["create"];
 $partition_by = array();
 foreach (array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST') as $key) {
diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index b9b82c6c..341d2d0f 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $row = $_POST;
 
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 0799008d..e7dd04bd 100644
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $tables_views = array_merge((array) $_POST["tables"], (array) $_POST["views"]);
 
 if ($tables_views && !$error && !$_POST["search"]) {
diff --git a/adminer/download.inc.php b/adminer/download.inc.php
index 9afe554c..c9f7ddab 100644
--- a/adminer/download.inc.php
+++ b/adminer/download.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["download"];
 $fields = fields($TABLE);
 header("Content-Type: application/octet-stream");
diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php
index 35110b2e..f1236734 100644
--- a/adminer/drivers/mongo.inc.php
+++ b/adminer/drivers/mongo.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $drivers["mongo"] = "MongoDB (alpha)";
 
 if (isset($_GET["mongo"])) {
diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index 0af106b2..7df3232c 100644
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -5,6 +5,8 @@
 * @author Jakub Vrana
 */
 
+namespace Adminer;
+
 $drivers["mssql"] = "MS SQL";
 
 if (isset($_GET["mssql"])) {
diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 6ae89e90..a44cad35 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -1,11 +1,13 @@
 <?php
+namespace Adminer;
+
 $drivers = array("server" => "MySQL") + $drivers;
 
 if (!defined("DRIVER")) {
 	define("DRIVER", "server"); // server - backwards compatibility
 	// MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable
 	if (extension_loaded("mysqli")) {
-		class Min_DB extends MySQLi {
+		class Min_DB extends \MySQLi {
 			var $extension = "MySQLi";
 
 			function __construct() {
diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index f25c551c..2e69057b 100644
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $drivers["oracle"] = "Oracle (beta)";
 
 if (isset($_GET["oracle"])) {
diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index b1557ee4..9436bd41 100644
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $drivers["pgsql"] = "PostgreSQL";
 
 if (isset($_GET["pgsql"])) {
diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 524f9e12..2a1e1d41 100644
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $drivers["sqlite"] = "SQLite";
 
 if (isset($_GET["sqlite"])) {
@@ -9,7 +11,7 @@ if (isset($_GET["sqlite"])) {
 			var $extension = "SQLite3", $server_info, $affected_rows, $errno, $error, $_link;
 
 			function __construct($filename) {
-				$this->_link = new SQLite3($filename);
+				$this->_link = new \SQLite3($filename);
 				$version = $this->_link->version();
 				$this->server_info = $version["versionString"];
 			}
@@ -90,7 +92,7 @@ if (isset($_GET["sqlite"])) {
 
 	}
 
-	if (class_exists("Min_SQLite")) {
+	if (class_exists('Adminer\Min_SQLite')) {
 		class Min_DB extends Min_SQLite {
 
 			function __construct() {
diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 68235ab7..8c57c83e 100644
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["dump"];
 
 if ($_POST && !$error) {
diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index bdc1fca6..7df63cf3 100644
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["edit"];
 $fields = fields($TABLE);
 $where = (isset($_GET["select"]) ? ($_POST["check"] && count($_POST["check"]) == 1 ? where_check($_POST["check"][0], $fields) : "") : where($_GET, $fields));
diff --git a/adminer/event.inc.php b/adminer/event.inc.php
index 592b189d..c9fd444d 100644
--- a/adminer/event.inc.php
+++ b/adminer/event.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $EVENT = $_GET["event"];
 $intervals = array("YEAR", "QUARTER", "MONTH", "DAY", "HOUR", "MINUTE", "WEEK", "SECOND", "YEAR_MONTH", "DAY_HOUR", "DAY_MINUTE", "DAY_SECOND", "HOUR_MINUTE", "HOUR_SECOND", "MINUTE_SECOND");
 $statuses = array("ENABLED" => "ENABLE", "DISABLED" => "DISABLE", "SLAVESIDE_DISABLED" => "DISABLE ON SLAVE");
diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index 0ffe2a89..d2bd2481 100644
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // caching headers added in compile.php
 
 if ($_GET["file"] == "favicon.ico") {
diff --git a/adminer/foreign.inc.php b/adminer/foreign.inc.php
index 6f271668..78791613 100644
--- a/adminer/foreign.inc.php
+++ b/adminer/foreign.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["foreign"];
 $name = $_GET["name"];
 $row = $_POST;
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 217dbeb6..7cd1f006 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // any method change in this file should be transferred to editor/include/adminer.inc.php and plugins/plugin.php
 
 class Adminer {
diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index e455c8ee..af540913 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $connection = '';
 
 $has_token = $_SESSION["token"];
@@ -144,7 +146,7 @@ function auth_error($error) {
 	exit;
 }
 
-if (isset($_GET["username"]) && !class_exists("Min_DB")) {
+if (isset($_GET["username"]) && !class_exists('Adminer\Min_DB')) {
 	unset($_SESSION["pwds"][DRIVER]);
 	unset_permanent();
 	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), false);
diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 9d997557..d83ac4a7 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 include "../adminer/include/version.inc.php";
 include "../adminer/include/errors.inc.php";
 include "../adminer/include/coverage.inc.php";
diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 15bd79fc..3a03a072 100644
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 if (isset($_GET["status"])) {
 	$_GET["variables"] = $_GET["status"];
 }
diff --git a/adminer/include/coverage.inc.php b/adminer/include/coverage.inc.php
index f2c8e717..f2e80bf3 100644
--- a/adminer/include/coverage.inc.php
+++ b/adminer/include/coverage.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // coverage is used in tests and removed in compilation
 if (extension_loaded("xdebug") && file_exists(sys_get_temp_dir() . "/adminer_coverage.ser")) {
 	function save_coverage() {
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index ac031267..600fdcb6 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 if (!ob_get_level()) {
 	ob_start(null, 4096);
 }
diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php
index 830a3492..4b5b98de 100644
--- a/adminer/include/driver.inc.php
+++ b/adminer/include/driver.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $drivers = array();
 
 /** Add a driver
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 99676fa6..5b5a773d 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // This file is not used in Adminer Editor.
 
 /** Print select result
diff --git a/adminer/include/errors.inc.php b/adminer/include/errors.inc.php
index ebe69f47..aca11370 100644
--- a/adminer/include/errors.inc.php
+++ b/adminer/include/errors.inc.php
@@ -1,7 +1,9 @@
 <?php
+namespace Adminer;
+
 function adminer_errors($errno, $errstr) {
 	return !!preg_match('~^(Trying to access array offset on( value of type)? null|Undefined (array key|property))~', $errstr);
 }
 
 error_reporting(6135); // errors and warnings
-set_error_handler('adminer_errors', E_WARNING);
+set_error_handler('Adminer\adminer_errors', E_WARNING);
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index a4703154..91fac863 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // This file is used both in Adminer and Adminer Editor.
 
 /** Get database connection
diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index aadf8fe5..0fbb8ca2 100644
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // not used in a single language version
 
 $langs = array(
diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php
index 9b560363..87c0256e 100644
--- a/adminer/include/pdo.inc.php
+++ b/adminer/include/pdo.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // PDO can be used in several database drivers
 if (extension_loaded('pdo')) {
 	/*abstract*/ class Min_PDO {
@@ -80,7 +82,7 @@ if (extension_loaded('pdo')) {
 		}
 	}
 
-	class Min_PDOStatement extends PDOStatement {
+	class Min_PDOStatement extends \PDOStatement {
 		var $_offset = 0, $num_rows;
 
 		function fetch_assoc() {
diff --git a/adminer/include/tmpfile.inc.php b/adminer/include/tmpfile.inc.php
index 79baf17b..e9cd8bc7 100644
--- a/adminer/include/tmpfile.inc.php
+++ b/adminer/include/tmpfile.inc.php
@@ -1,4 +1,5 @@
 <?php
+namespace Adminer;
 
 class TmpFile {
 	var $handler;
diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 679d39b5..9653a741 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,4 @@
 <?php
+namespace Adminer;
+
 $VERSION = "5.0.0-dev";
diff --git a/adminer/include/xxtea.inc.php b/adminer/include/xxtea.inc.php
index bc835803..b786623c 100644
--- a/adminer/include/xxtea.inc.php
+++ b/adminer/include/xxtea.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 /** PHP implementation of XXTEA encryption algorithm
 * @author Ma Bingyao <andot@ujn.edu.cn>
 * @link http://www.coolcode.cn/?action=show&id=128
diff --git a/adminer/index.php b/adminer/index.php
index c5c330d9..8e004ea9 100644
--- a/adminer/index.php
+++ b/adminer/index.php
@@ -7,6 +7,8 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
+namespace Adminer;
+
 include "./include/bootstrap.inc.php";
 include "./include/tmpfile.inc.php";
 
diff --git a/adminer/indexes.inc.php b/adminer/indexes.inc.php
index 119e59fe..64efbabb 100644
--- a/adminer/indexes.inc.php
+++ b/adminer/indexes.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["indexes"];
 $index_types = array("PRIMARY", "UNIQUE", "INDEX");
 $table_status = table_status($TABLE, true);
diff --git a/adminer/lang/ar.inc.php b/adminer/lang/ar.inc.php
index 794e7ca3..d84fc8be 100644
--- a/adminer/lang/ar.inc.php
+++ b/adminer/lang/ar.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'تسجيل الدخول',
 	'Logout successful.' => 'تم تسجيل الخروج بنجاح.',
diff --git a/adminer/lang/bg.inc.php b/adminer/lang/bg.inc.php
index ce250da1..f54322c7 100644
--- a/adminer/lang/bg.inc.php
+++ b/adminer/lang/bg.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Система',
diff --git a/adminer/lang/bn.inc.php b/adminer/lang/bn.inc.php
index cd3ff68e..9d0c9cc8 100644
--- a/adminer/lang/bn.inc.php
+++ b/adminer/lang/bn.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'লগইন',
 	'Logout successful.' => 'সফলভাবে লগআউট হয়েছে।',
diff --git a/adminer/lang/bs.inc.php b/adminer/lang/bs.inc.php
index 83f8deff..94e15344 100644
--- a/adminer/lang/bs.inc.php
+++ b/adminer/lang/bs.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
diff --git a/adminer/lang/ca.inc.php b/adminer/lang/ca.inc.php
index 16b0ff0c..31993fc8 100644
--- a/adminer/lang/ca.inc.php
+++ b/adminer/lang/ca.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Inicia la sessió',
 	'Logout successful.' => 'Desconnexió correcta.',
diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index ac2c91de..06a6991e 100644
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Systém',
diff --git a/adminer/lang/da.inc.php b/adminer/lang/da.inc.php
index 48c3b94c..a112a246 100644
--- a/adminer/lang/da.inc.php
+++ b/adminer/lang/da.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'System' => 'System',
 	'Server' => 'Server',
diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php
index 89506fa2..8c6ee3eb 100644
--- a/adminer/lang/de.inc.php
+++ b/adminer/lang/de.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
diff --git a/adminer/lang/el.inc.php b/adminer/lang/el.inc.php
index 3dd86505..367427d1 100644
--- a/adminer/lang/el.inc.php
+++ b/adminer/lang/el.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Σύστημα',
diff --git a/adminer/lang/en.inc.php b/adminer/lang/en.inc.php
index b4b3b57b..764e2d26 100644
--- a/adminer/lang/en.inc.php
+++ b/adminer/lang/en.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Too many unsuccessful logins, try again in %d minute.', 'Too many unsuccessful logins, try again in %d minutes.'),
 	'Query executed OK, %d row(s) affected.' => array('Query executed OK, %d row affected.', 'Query executed OK, %d rows affected.'),
diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php
index 30b5400e..7dbef8b6 100644
--- a/adminer/lang/es.inc.php
+++ b/adminer/lang/es.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Sesión finalizada con éxito.',
diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php
index b7e47d3f..ad386145 100644
--- a/adminer/lang/et.inc.php
+++ b/adminer/lang/et.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Logi sisse',
 	'Logout successful.' => 'Väljalogimine õnnestus.',
diff --git a/adminer/lang/fa.inc.php b/adminer/lang/fa.inc.php
index 61ea4396..8ceca613 100644
--- a/adminer/lang/fa.inc.php
+++ b/adminer/lang/fa.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'سیستم',
diff --git a/adminer/lang/fi.inc.php b/adminer/lang/fi.inc.php
index 29a769c4..52d2c558 100644
--- a/adminer/lang/fi.inc.php
+++ b/adminer/lang/fi.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Järjestelmä',
diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php
index 30fe6686..6d1ad019 100644
--- a/adminer/lang/fr.inc.php
+++ b/adminer/lang/fr.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Authentification',
 	'Logout successful.' => 'Au revoir !',
diff --git a/adminer/lang/gl.inc.php b/adminer/lang/gl.inc.php
index 22bd6c65..b6b0b093 100644
--- a/adminer/lang/gl.inc.php
+++ b/adminer/lang/gl.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Conectar',
 	'Logout successful.' => 'Pechouse a sesión con éxito.',
diff --git a/adminer/lang/he.inc.php b/adminer/lang/he.inc.php
index ff7cc466..d5440556 100644
--- a/adminer/lang/he.inc.php
+++ b/adminer/lang/he.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'התחברות',
 	'Logout successful.' => 'ההתחברות הצליחה',
diff --git a/adminer/lang/hu.inc.php b/adminer/lang/hu.inc.php
index be116744..cda89a96 100644
--- a/adminer/lang/hu.inc.php
+++ b/adminer/lang/hu.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Belépés',
 	'Logout successful.' => 'Sikeres kilépés.',
diff --git a/adminer/lang/id.inc.php b/adminer/lang/id.inc.php
index 03ac8d2e..b66ba255 100644
--- a/adminer/lang/id.inc.php
+++ b/adminer/lang/id.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php
index 020b0714..d9925859 100644
--- a/adminer/lang/it.inc.php
+++ b/adminer/lang/it.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Autenticazione',
 	'Logout successful.' => 'Uscita effettuata con successo.',
diff --git a/adminer/lang/ja.inc.php b/adminer/lang/ja.inc.php
index 88e9d6fd..7deef1db 100644
--- a/adminer/lang/ja.inc.php
+++ b/adminer/lang/ja.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'ログイン',
 	'Logout successful.' => 'ログアウト',
diff --git a/adminer/lang/ka.inc.php b/adminer/lang/ka.inc.php
index 96f037bd..e8e0dc97 100644
--- a/adminer/lang/ka.inc.php
+++ b/adminer/lang/ka.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'შესვლა',
 	'Logout successful.' => 'გამოხვედით სისტემიდან.',
diff --git a/adminer/lang/ko.inc.php b/adminer/lang/ko.inc.php
index 20afaf69..7268e044 100644
--- a/adminer/lang/ko.inc.php
+++ b/adminer/lang/ko.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'$1-$3-$5' => '$1-$3-$5',
 	'%.3f s' => '%.3f 초',
diff --git a/adminer/lang/lt.inc.php b/adminer/lang/lt.inc.php
index 8223c237..31a17172 100644
--- a/adminer/lang/lt.inc.php
+++ b/adminer/lang/lt.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistema',
diff --git a/adminer/lang/lv.inc.php b/adminer/lang/lv.inc.php
index 2a54f14a..2e141591 100644
--- a/adminer/lang/lv.inc.php
+++ b/adminer/lang/lv.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Ieiet',
 	'Logout successful.' => 'Jūs veiksmīgi izgājāt no sistēmas.',
diff --git a/adminer/lang/ms.inc.php b/adminer/lang/ms.inc.php
index e635b700..b02f9410 100644
--- a/adminer/lang/ms.inc.php
+++ b/adminer/lang/ms.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php
index b729de4e..838bd7c2 100644
--- a/adminer/lang/nl.inc.php
+++ b/adminer/lang/nl.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Aanmelden',
 	'Logout successful.' => 'Successvol afgemeld.',
diff --git a/adminer/lang/no.inc.php b/adminer/lang/no.inc.php
index 0fd5cb8c..6c49f60d 100644
--- a/adminer/lang/no.inc.php
+++ b/adminer/lang/no.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'System' => 'System',
 	'Server' => 'Server',
diff --git a/adminer/lang/pl.inc.php b/adminer/lang/pl.inc.php
index acf43007..f547cb22 100644
--- a/adminer/lang/pl.inc.php
+++ b/adminer/lang/pl.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Rodzaj bazy',
diff --git a/adminer/lang/pt-br.inc.php b/adminer/lang/pt-br.inc.php
index c0c7758b..4ca86b4d 100644
--- a/adminer/lang/pt-br.inc.php
+++ b/adminer/lang/pt-br.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Saída bem sucedida.',
diff --git a/adminer/lang/pt.inc.php b/adminer/lang/pt.inc.php
index d8eb4fbb..3b025753 100644
--- a/adminer/lang/pt.inc.php
+++ b/adminer/lang/pt.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Sessão terminada com sucesso.',
diff --git a/adminer/lang/ro.inc.php b/adminer/lang/ro.inc.php
index bb6291dc..e09774b9 100644
--- a/adminer/lang/ro.inc.php
+++ b/adminer/lang/ro.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Intră',
 	'Logout successful.' => 'Ați ieșit cu succes.',
diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php
index 94efdf24..c92f39e4 100644
--- a/adminer/lang/ru.inc.php
+++ b/adminer/lang/ru.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Войти',
 	'Logout successful.' => 'Вы успешно покинули систему.',
diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php
index 571fcb68..769e98cc 100644
--- a/adminer/lang/sk.inc.php
+++ b/adminer/lang/sk.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Prihlásiť sa',
 	'Logout successful.' => 'Odhlásenie prebehlo v poriadku.',
diff --git a/adminer/lang/sl.inc.php b/adminer/lang/sl.inc.php
index f1bc6ae8..83da306d 100644
--- a/adminer/lang/sl.inc.php
+++ b/adminer/lang/sl.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
diff --git a/adminer/lang/sr.inc.php b/adminer/lang/sr.inc.php
index e56e1617..3b6f10fb 100644
--- a/adminer/lang/sr.inc.php
+++ b/adminer/lang/sr.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Систем',
diff --git a/adminer/lang/sv.inc.php b/adminer/lang/sv.inc.php
index 45cc1eb4..be9defa8 100644
--- a/adminer/lang/sv.inc.php
+++ b/adminer/lang/sv.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'System',
diff --git a/adminer/lang/ta.inc.php b/adminer/lang/ta.inc.php
index 0cda8d70..bc09035b 100644
--- a/adminer/lang/ta.inc.php
+++ b/adminer/lang/ta.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'நுழை',
 	'Logout successful.' => 'வெற்றிக‌ர‌மாய் வெளியேறியாயிற்று.',
diff --git a/adminer/lang/th.inc.php b/adminer/lang/th.inc.php
index ce4243c7..1832a856 100644
--- a/adminer/lang/th.inc.php
+++ b/adminer/lang/th.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'เข้าสู่ระบบ',
 	'Logout successful.' => 'ออกจากระบบเรียบร้อยแล้ว.',
diff --git a/adminer/lang/tr.inc.php b/adminer/lang/tr.inc.php
index 3809fa98..15eea729 100644
--- a/adminer/lang/tr.inc.php
+++ b/adminer/lang/tr.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
diff --git a/adminer/lang/uk.inc.php b/adminer/lang/uk.inc.php
index ec468f0c..4aec05b0 100644
--- a/adminer/lang/uk.inc.php
+++ b/adminer/lang/uk.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Система Бази Даних',
diff --git a/adminer/lang/vi.inc.php b/adminer/lang/vi.inc.php
index 2195971d..4d03cdec 100644
--- a/adminer/lang/vi.inc.php
+++ b/adminer/lang/vi.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Hệ thống',
diff --git a/adminer/lang/xx.inc.php b/adminer/lang/xx.inc.php
index 0a6ec476..19a5f504 100644
--- a/adminer/lang/xx.inc.php
+++ b/adminer/lang/xx.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Xx',
diff --git a/adminer/lang/zh-tw.inc.php b/adminer/lang/zh-tw.inc.php
index d7faab56..57ffae97 100644
--- a/adminer/lang/zh-tw.inc.php
+++ b/adminer/lang/zh-tw.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => '資料庫系統',
diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php
index bf7a89d2..f582d775 100644
--- a/adminer/lang/zh.inc.php
+++ b/adminer/lang/zh.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => '系统',
diff --git a/adminer/privileges.inc.php b/adminer/privileges.inc.php
index eac36544..d3cd6142 100644
--- a/adminer/privileges.inc.php
+++ b/adminer/privileges.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 page_header(lang('Privileges'));
 
 echo '<p class="links"><a href="' . h(ME) . 'user=">' . lang('Create user') . "</a>";
diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index 265bd6d2..43b3d4e2 100644
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["procedure"]);
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
 $row = $_POST;
diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index e36143a1..70566872 100644
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 if (support("kill")) {
 	if ($_POST && !$error) {
 		$killed = 0;
diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 17e0c38d..14060525 100644
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 page_header(lang('Database schema'), "", array(), h(DB . ($_GET["ns"] ? ".$_GET[ns]" : "")));
 
 $table_pos = array();
diff --git a/adminer/scheme.inc.php b/adminer/scheme.inc.php
index 0795b2a8..6c2c10ac 100644
--- a/adminer/scheme.inc.php
+++ b/adminer/scheme.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $row = $_POST;
 
 if ($_POST && !$error) {
diff --git a/adminer/script.inc.php b/adminer/script.inc.php
index 4eaad40f..0d807cd3 100644
--- a/adminer/script.inc.php
+++ b/adminer/script.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 header("Content-Type: text/javascript; charset=utf-8");
 
 if ($_GET["script"] == "db") {
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 065dba40..50a8530f 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["select"];
 $table_status = table_status1($TABLE);
 $indexes = indexes($TABLE);
diff --git a/adminer/sequence.inc.php b/adminer/sequence.inc.php
index 0e1af4e6..c8bbb9fb 100644
--- a/adminer/sequence.inc.php
+++ b/adminer/sequence.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $SEQUENCE = $_GET["sequence"];
 $row = $_POST;
 
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index fa1d643f..e6ccb0c6 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 if (!$error && $_POST["export"]) {
 	dump_headers("sql");
 	$adminer->dumpTable("", "");
diff --git a/adminer/table.inc.php b/adminer/table.inc.php
index be73e611..6263518e 100644
--- a/adminer/table.inc.php
+++ b/adminer/table.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["table"];
 $fields = fields($TABLE);
 if (!$fields) {
diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php
index 125a4d1f..bf0a7233 100644
--- a/adminer/trigger.inc.php
+++ b/adminer/trigger.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["trigger"];
 $name = $_GET["name"];
 $trigger_options = trigger_options();
diff --git a/adminer/type.inc.php b/adminer/type.inc.php
index 3cc3406a..9e2b0c1a 100644
--- a/adminer/type.inc.php
+++ b/adminer/type.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TYPE = $_GET["type"];
 $row = $_POST;
 
diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index b43cdabf..cf4ecc77 100644
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $USER = $_GET["user"];
 $privileges = array("" => array("All privileges" => ""));
 foreach (get_rows("SHOW PRIVILEGES") as $row) {
diff --git a/adminer/variables.inc.php b/adminer/variables.inc.php
index 16c14798..7b561a83 100644
--- a/adminer/variables.inc.php
+++ b/adminer/variables.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $status = isset($_GET["status"]);
 page_header($status ? lang('Status') : lang('Variables'));
 
diff --git a/adminer/view.inc.php b/adminer/view.inc.php
index 1e8445d4..47105cb1 100644
--- a/adminer/view.inc.php
+++ b/adminer/view.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["view"];
 $row = $_POST;
 $orig_type = "VIEW";
diff --git a/compile.php b/compile.php
index 17d8cb37..6e2a31d5 100755
--- a/compile.php
+++ b/compile.php
@@ -1,5 +1,7 @@
 #!/usr/bin/env php
 <?php
+namespace Adminer;
+
 include __DIR__ . "/adminer/include/version.inc.php";
 include __DIR__ . "/adminer/include/errors.inc.php";
 include __DIR__ . "/externals/JsShrink/jsShrink.php";
diff --git a/editor/db.inc.php b/editor/db.inc.php
index 825baa8b..276b99f4 100644
--- a/editor/db.inc.php
+++ b/editor/db.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 page_header(lang('Server'), "", false);
 
 if ($adminer->homepage()) {
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index c7833b6b..a3562ee8 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 class Adminer {
 	var $operators = array("<=", ">=");
 	var $_values = array();
diff --git a/editor/include/connect.inc.php b/editor/include/connect.inc.php
index feb69e27..e0183e16 100644
--- a/editor/include/connect.inc.php
+++ b/editor/include/connect.inc.php
@@ -1,2 +1,4 @@
 <?php
+namespace Adminer;
+
 $connection->select_db($adminer->database());
diff --git a/editor/include/editing.inc.php b/editor/include/editing.inc.php
index f11a9162..b3eccaab 100644
--- a/editor/include/editing.inc.php
+++ b/editor/include/editing.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 /** Encode e-mail header in UTF-8
 * @param string
 * @return string
diff --git a/editor/index.php b/editor/index.php
index 3972bdbf..4cd8c343 100644
--- a/editor/index.php
+++ b/editor/index.php
@@ -7,6 +7,8 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
+namespace Adminer;
+
 include "../adminer/include/bootstrap.inc.php";
 $drivers[DRIVER] = lang('Login');
 
diff --git a/editor/script.inc.php b/editor/script.inc.php
index fd06e26c..83a29ab1 100644
--- a/editor/script.inc.php
+++ b/editor/script.inc.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 if ($_GET["script"] == "kill") {
 	$connection->query("KILL " . number($_POST["kill"]));
 
diff --git a/lang.php b/lang.php
index b9b805ff..d0ac9b62 100755
--- a/lang.php
+++ b/lang.php
@@ -1,5 +1,7 @@
 #!/usr/bin/env php
 <?php
+namespace Adminer;
+
 include __DIR__ . "/adminer/include/errors.inc.php";
 
 unset($_COOKIE["adminer_lang"]);
diff --git a/phpcs.xml b/phpcs.xml
index af386e3f..c9ad4941 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,7 +15,6 @@
 		<exclude name="PSR12.Files.FileHeader.SpacingAfterBlock"/>
 		<exclude name="PSR12.Operators.OperatorSpacing.NoSpaceBefore"/>
 		<exclude name="PSR12.Operators.OperatorSpacing.NoSpaceAfter"/>
-		<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
 		<exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses"/>
 		<exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine"/><!-- Replaced by: Generic.Classes.OpeningBraceSameLine -->
 		<exclude name="PSR2.Classes.ClassDeclaration.CloseBraceAfterBody"/>
@@ -42,6 +41,10 @@
 		<exclude name="Generic.WhiteSpace.ScopeIndent.IncorrectExact"/>
 	</rule>
 
+	<rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace">
+		<exclude-pattern>plugins/[^/]+\.php</exclude-pattern>
+	</rule>
+
 	<rule ref="Generic.Classes.OpeningBraceSameLine"/>
 	<rule ref="Generic.Whitespace.DisallowSpaceIndent"/>
 	<rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie"/>
diff --git a/plugins/drivers/clickhouse.php b/plugins/drivers/clickhouse.php
index aa9d178c..5807b253 100644
--- a/plugins/drivers/clickhouse.php
+++ b/plugins/drivers/clickhouse.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 add_driver("clickhouse", "ClickHouse (alpha)");
 
 if (isset($_GET["clickhouse"])) {
diff --git a/plugins/drivers/elastic.php b/plugins/drivers/elastic.php
index efe8355d..444f57f8 100644
--- a/plugins/drivers/elastic.php
+++ b/plugins/drivers/elastic.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 add_driver("elastic", "Elasticsearch 7 (beta)");
 
 if (isset($_GET["elastic"])) {
diff --git a/plugins/drivers/elastic5.php b/plugins/drivers/elastic5.php
index 15b4d9ae..6164eee5 100644
--- a/plugins/drivers/elastic5.php
+++ b/plugins/drivers/elastic5.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 add_driver("elastic5", "Elasticsearch 5 (beta)");
 
 if (isset($_GET["elastic5"])) {
diff --git a/plugins/drivers/firebird.php b/plugins/drivers/firebird.php
index 434bb54c..65ada85b 100644
--- a/plugins/drivers/firebird.php
+++ b/plugins/drivers/firebird.php
@@ -3,6 +3,8 @@
 * @author Steve Krämer
 */
 
+namespace Adminer;
+
 add_driver('firebird', 'Firebird (alpha)');
 
 if (isset($_GET["firebird"])) {
diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php
index cfbfc7de..2d6f6ec3 100644
--- a/plugins/drivers/simpledb.php
+++ b/plugins/drivers/simpledb.php
@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 add_driver("simpledb", "SimpleDB");
 
 if (isset($_GET["simpledb"])) {
diff --git a/plugins/edit-calendar.php b/plugins/edit-calendar.php
index 93702d5a..1e757412 100644
--- a/plugins/edit-calendar.php
+++ b/plugins/edit-calendar.php
@@ -30,7 +30,7 @@ class AdminerEditCalendar {
 
 	function head() {
 		echo $this->prepend;
-		if ($this->langPath && function_exists('get_lang')) { // since Adminer 3.2.0
+		if ($this->langPath) {
 			$lang = get_lang();
 			$lang = ($lang == "zh" ? "zh-CN" : ($lang == "zh-tw" ? "zh-TW" : $lang));
 			if ($lang != "en" && file_exists(sprintf($this->langPath, $lang))) {
diff --git a/plugins/tinymce.php b/plugins/tinymce.php
index a6cad006..d9ef91b4 100644
--- a/plugins/tinymce.php
+++ b/plugins/tinymce.php
@@ -19,13 +19,10 @@ class AdminerTinymce {
 	}
 
 	function head() {
-		$lang = "en";
-		if (function_exists('get_lang')) { // since Adminer 3.2.0
-			$lang = get_lang();
-			$lang = ($lang == "zh" ? "zh-cn" : ($lang == "zh-tw" ? "zh" : $lang));
-			if (!file_exists(dirname($this->path) . "/langs/$lang.js")) {
-				$lang = "en";
-			}
+		$lang = get_lang();
+		$lang = ($lang == "zh" ? "zh-cn" : ($lang == "zh-tw" ? "zh" : $lang));
+		if (!file_exists(dirname($this->path) . "/langs/$lang.js")) {
+			$lang = "en";
 		}
 		echo script_src($this->path);
 		?>
diff --git a/plugins/wymeditor.php b/plugins/wymeditor.php
index ca452bcb..b8c82af7 100644
--- a/plugins/wymeditor.php
+++ b/plugins/wymeditor.php
@@ -52,11 +52,8 @@ class AdminerWymeditor {
 	function editInput($table, $field, $attrs, $value) {
 		static $lang = "";
 		if (!$lang && preg_match("~text~", $field["type"]) && preg_match("~_html~", $field["field"])) {
-			$lang = "en";
-			if (function_exists('get_lang')) { // since Adminer 3.2.0
-				$lang = get_lang();
-				$lang = ($lang == "zh" || $lang == "zh-tw" ? "zh_cn" : $lang);
-			}
+			$lang = get_lang();
+			$lang = ($lang == "zh" || $lang == "zh-tw" ? "zh_cn" : $lang);
 			return "<textarea$attrs id='fields-" . h($field["field"]) . "' rows='12' cols='50'>" . h($value) . "</textarea>" . script("
 jQuery('#fields-" . js_escape($field["field"]) . "').wymeditor({ updateSelector: '#form [type=\"submit\"]', lang: '$lang'" . ($this->options ? ", $this->options" : "") . " });
 ");