From d4f99d5cdcb6ffae301ad2c587de7dd13a5d40ac Mon Sep 17 00:00:00 2001
From: Peter Knut <peter@pematon.com>
Date: Thu, 17 Oct 2024 00:24:53 +0200
Subject: [PATCH] Bump version to 4.10-dev

---
 adminer/include/bootstrap.inc.php | 1 +
 adminer/include/errors.inc.php    | 7 +++++++
 adminer/include/version.inc.php   | 9 +--------
 compile.php                       | 1 +
 lang.php                          | 3 ++-
 5 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 adminer/include/errors.inc.php

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index cc5f2001..d5c05511 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -1,5 +1,6 @@
 <?php
 include "../adminer/include/version.inc.php";
+include "../adminer/include/errors.inc.php";
 include "../adminer/include/coverage.inc.php";
 
 // disable filter.default
diff --git a/adminer/include/errors.inc.php b/adminer/include/errors.inc.php
new file mode 100644
index 00000000..ebe69f47
--- /dev/null
+++ b/adminer/include/errors.inc.php
@@ -0,0 +1,7 @@
+<?php
+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);
diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index e2309dd8..0895f811 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,9 +1,2 @@
 <?php
-$VERSION = "4.9.4";
-
-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);
+$VERSION = "4.10.0-dev";
diff --git a/compile.php b/compile.php
index a9716f2a..1117c0ca 100755
--- a/compile.php
+++ b/compile.php
@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
 include dirname(__FILE__) . "/adminer/include/version.inc.php";
+include dirname(__FILE__) . "/adminer/include/errors.inc.php";
 include dirname(__FILE__) . "/externals/JsShrink/jsShrink.php";
 
 function add_apo_slashes($s) {
diff --git a/lang.php b/lang.php
index 28ce433d..f46f6d8b 100755
--- a/lang.php
+++ b/lang.php
@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
-error_reporting(6135); // errors and warnings
+include dirname(__FILE__) . "/adminer/include/errors.inc.php";
+
 unset($_COOKIE["adminer_lang"]);
 $_SESSION["lang"] = $_SERVER["argv"][1]; // Adminer functions read language from session
 if (isset($_SESSION["lang"])) {