From 55ad89b3097f00512c761c1252e10447fb61ca2e Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sat, 11 Jan 2014 09:37:34 -0800
Subject: [PATCH] Fix handling of long text in SQL textarea

---
 adminer/include/adminer.inc.php | 1 +
 adminer/include/version.inc.php | 2 +-
 changes.txt                     | 3 +++
 compile.php                     | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 336ef359..12df8c50 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -73,6 +73,7 @@ class Adminer {
 <link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
 <script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
 <script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
+<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>
 <script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
 <?php
 		return true;
diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 31ae691b..556c7f16 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.0.1";
+$VERSION = "4.0.2-dev";
diff --git a/changes.txt b/changes.txt
index d5c9b290..9b9f307e 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 4.0.2-dev:
+Fix handling of long text in SQL textarea
+
 Adminer 4.0.1 (released 2014-01-11):
 Don't use type=number if a SQL function is used
 Disable highlighting in textareas with long texts
diff --git a/compile.php b/compile.php
index 8e84dea2..9c06d4e0 100755
--- a/compile.php
+++ b/compile.php
@@ -374,7 +374,7 @@ if ($driver) {
 	if (count($drivers) == 1) {
 		$file = str_replace('<?php echo html_select("driver", $drivers, DRIVER); ?>', "<input type='hidden' name='driver' value='" . ($driver == "mysql" ? "server" : $driver) . "'>" . reset($drivers), $file);
 	}
-	$file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
+	$file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
 }
 if ($project == "editor") {
 	$file = preg_replace('~;../externals/jush/jush.css~', '', $file);