Bump version to 4.10-dev

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index cc5f20010bbde396eaaafadf4c38dddbf077dad0..d5c055115f26ad3136f0c418fffdd7f4ba7e6e52 100644 (file)
--- 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 (file)
index 0000000..ebe69f4
--- /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 e2309dd866e3980b4677de419961b10aa1de2620..0895f8110c6bd1858b39acd224aae88eacdfcb06 100644 (file)
--- 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 a9716f2ac2008809e936b25c75732ea8dda7ff43..1117c0ca48cc86c408e90bbab8ca100b5899217f 100755 (executable)
--- 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 28ce433d7053497e5fbe1a6aeee81fe2db1a9b26..f46f6d8ba3f9bc24557e5fa2467e7a98030720d2 100755 (executable)
--- 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"])) {