Fix handling of long text in SQL textarea
This commit is contained in:
parent
740843446f
commit
55ad89b309
|
@ -73,6 +73,7 @@ class Adminer {
|
||||||
<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
|
<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.js"></script>
|
||||||
<script type="text/javascript" src="../externals/jush/modules/jush-textarea.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>
|
<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
|
||||||
<?php
|
<?php
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
<?php
|
<?php
|
||||||
$VERSION = "4.0.1";
|
$VERSION = "4.0.2-dev";
|
||||||
|
|
|
@ -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):
|
Adminer 4.0.1 (released 2014-01-11):
|
||||||
Don't use type=number if a SQL function is used
|
Don't use type=number if a SQL function is used
|
||||||
Disable highlighting in textareas with long texts
|
Disable highlighting in textareas with long texts
|
||||||
|
|
|
@ -374,7 +374,7 @@ if ($driver) {
|
||||||
if (count($drivers) == 1) {
|
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 = 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") {
|
if ($project == "editor") {
|
||||||
$file = preg_replace('~;../externals/jush/jush.css~', '', $file);
|
$file = preg_replace('~;../externals/jush/jush.css~', '', $file);
|
||||||
|
|
Loading…
Reference in a new issue