From: Jakub Vrana <jakub@vrana.cz>
Date: Thu, 8 Feb 2018 22:47:16 +0000 (+0100)
Subject: MariaDB: Links to documentation in syntax highlighting
X-Git-Tag: v4.6.1~2
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=e299e9d82db3af05a5249030d854f81d1f0e77e2;p=adminer.git

MariaDB: Links to documentation in syntax highlighting
---

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index a234cf3c..68dad1e4 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -960,8 +960,9 @@ class Adminer {
 						echo "jushLinks.$val = jushLinks.$jush;\n";
 					}
 				}
+				$server_info = $connection->server_info;
 				?>
-bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\\d\\.?\\d).*~s', '\\1', $connection->server_info) : ""); ?>');
+bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\\d\\.?\\d).*~s', '\\1', $server_info) : ""); ?>'<?php echo (preg_match('~MariaDB~', $server_info) ? ", true" : ""); ?>);
 </script>
 <?php
 			}
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 8f4c4b13..694dd76e 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -2,8 +2,9 @@
 
 /** Load syntax highlighting
 * @param string first three characters of database system version
+* @param [boolean]
 */
-function bodyLoad(version) {
+function bodyLoad(version, maria) {
 	if (window.jush) {
 		jush.create_links = ' target="_blank" rel="noreferrer noopener"';
 		if (version) {
@@ -12,8 +13,14 @@ function bodyLoad(version) {
 				if (typeof obj[key] != 'string') {
 					obj = obj[key];
 					key = 0;
+					if (maria) {
+						for (var i = 1; i < obj.length; i++) {
+							obj[i] = obj[i].replace(/\.html/, '/');
+						}
+					}
 				}
 				obj[key] = obj[key]
+					.replace(/dev\.mysql\.com\/doc\/mysql\/en\//, (maria ? 'mariadb.com/kb/en/library/' : '$&')) // MariaDB
 					.replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
 					.replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
 				;
diff --git a/externals/jush b/externals/jush
index b1801c40..275c9cc8 160000
--- a/externals/jush
+++ b/externals/jush
@@ -1 +1 @@
-Subproject commit b1801c40d9cf4d68b7d1c8085f4f95c26c0c6a9e
+Subproject commit 275c9cc888608f36895e3926c16e8d2e2dab0a1c