Fix handling of long text in SQL textarea

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 336ef35976e8717f7670a7ba98a158d3b04f562f..12df8c50ff0cd99bc7fa63751ace215a477d55a3 100644 (file)
--- 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 31ae691b6a44811e1b24fa967805e696348d14c1..556c7f162ab5fb7747e461f20e383420be4d719f 100644 (file)
--- 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 d5c9b2908ce85722ada8db039b0071b548d493fc..9b9f307ee506705abb73dfcab3aedfe945e8056f 100644 (file)
--- 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 8e84dea25a869c2328e286ba6e0d8116b3dc038f..9c06d4e0313959bf73fbdda6319ec03f80be2b63 100755 (executable)
--- 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);