mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-08 07:36:44 +02:00
Code Issues Releases Wiki Activity

Support JSON since MariaDB 10.2 (bug #590)

Browse Source
This commit is contained in:
Jakub Vrana
2018-01-29 21:08:38 +01:00
parent c3b4208853
commit 75450548b3
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adminer/include/functions.inc.php
View File

@@ -76,11 +76,15 @@ function bracket_escape($idf, $back = false) {
/** Check if connection has at least the given version
* @param string required version
* @param string required MariaDB version
* @param Min_DB defaults to $connection
* @return bool
*/
function min_version($version, $maria_db = "") {
function min_version($version, $maria_db = "", $connection2 = null) {
global $connection;
$server_info = $connection->server_info;
if (!$connection2) {
$connection2 = $connection;
}
$server_info = $connection2->server_info;
if ($maria_db && preg_match('~([\d.]+)-MariaDB~', $server_info, $match)) {
$server_info = $match[1];
$version = $maria_db;