Merge remote-tracking branch 'origin/master'

phpmyadmin · Jul 8, 2017 · 6e71574 · 6e71574
2 parents 5f02c8f + a6e0a69
commit 6e71574
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog
 - issue #13145 Improved layout of operations pages
 
 4.7.3 (not yet released)
+- issue #13447 Large multi-line query removes Export operation and blanks query box options
 
 4.7.2 (2017-06-29)
 - issue #13314 Make theme selection keep current server

diff --git a/libraries/Util.php b/libraries/Util.php
@@ -1759,11 +1759,6 @@ public static function linkOrButton(
         $new_form = true, $strip_img = false, $target = '', $force_button = false
     ) {
         $url_length = mb_strlen($url);
-        // with this we should be able to catch case of image upload
-        // into a (MEDIUM) BLOB; not worth generating even a form for these
-        if ($url_length > $GLOBALS['cfg']['LinkLengthLimit'] * 100) {
-            return '';
-        }
 
         if (! is_array($tag_params)) {
             $tmp = $tag_params;