Merge branch 'QA_4_0'

Marc Delisle · Marc Delisle · commit 4c0ec8563f5e · 2013-09-14T06:25:04.000-04:00
diff --git a/ChangeLog b/ChangeLog
@@ -47,6 +47,7 @@ phpMyAdmin - ChangeLog
 - bug #3997 Error handling in case MySQL extension is missing
 - bug #4089 Moving Columns will alter column definition
 - bug #4091 Insert ignore option does not work
+- bug #4090 Downloading BLOB downloads page template
 
 4.0.6.0 (2013-09-05)
 - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)
diff --git a/tbl_get_field.php b/tbl_get_field.php
@@ -9,6 +9,8 @@
 /**
  * Common functions.
  */
+// we don't want the usual PMA_Response-generated HTML above the column's data
+define('PMA_BYPASS_GET_INSTANCE', 1);
 require_once 'libraries/common.inc.php';
 require_once 'libraries/mime.lib.php';
 
