The branch, master has been updated via 7bbe78b049a6bd4158f3581b5cf2d27ff9074945 (commit) from 9d441ee499cfb9c54e046ab208c407da974c09d6 (commit)

- Log ----------------------------------------------------------------- commit 7bbe78b049a6bd4158f3581b5cf2d27ff9074945 Author: Marc Delisle marc@infomarc.info Date: Sat Sep 10 07:32:57 2011 -0400

With previous logic, could not change a BLOB column to specify its MIME type

-----------------------------------------------------------------------

Summary of changes: libraries/common.lib.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php index b65405b..b648ccf 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2899,11 +2899,13 @@ function PMA_extractFieldSpec($fieldspec) /* Create printable type name */ $printtype = strtolower($fieldspec);

- // strip the "BINARY" attribute, except if we find "BINARY(" because - // this would be a BINARY or VARBINARY field type - if (!preg_match('@binary[(]@', $printtype)) { - $binary = strpos($printtype, 'blob') !== false || strpos($printtype, 'binary') !== false; + // Strip the "BINARY" attribute, except if we find "BINARY(" because + // this would be a BINARY or VARBINARY field type; + // by the way, a BLOB should not show the BINARY attribute + // because this is not accepted in MySQL syntax. + if (preg_match('@binary@', $printtype) && ! preg_match('@binary[(]@', $printtype)) { $printtype = preg_replace('@binary@', '', $printtype); + $binary = true; } else { $binary = false; }

hooks/post-receive