From 7f445f99e362aa97f3ac7f8f0663418f6a2f339d Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Thu, 15 May 2014 17:53:10 +0530 Subject: [PATCH] Bug fix #4411 Protect Binary when set to no in settings still does not allow insert binary data Signed-off-by: Chirayu Chiripal test case fix Signed-off-by: Chirayu Chiripal --- libraries/insert_edit.lib.php | 6 +++--- test/libraries/PMA_insert_edit_test.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 2672e97dc0..27ee6191ae 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1099,9 +1099,9 @@ function PMA_getBinaryAndBlobColumn( $vkey, $is_upload ) { $html_output = ''; - if (($GLOBALS['cfg']['ProtectBinary'] && $column['is_blob']) - || ($GLOBALS['cfg']['ProtectBinary'] == 'all' && $column['is_binary']) - || ($GLOBALS['cfg']['ProtectBinary'] == 'noblob' && !$column['is_blob']) + if (($GLOBALS['cfg']['ProtectBinary'] === 'blob' && $column['is_blob']) + || ($GLOBALS['cfg']['ProtectBinary'] === 'all') + || ($GLOBALS['cfg']['ProtectBinary'] === 'noblob' && !$column['is_blob']) ) { $html_output .= __('Binary - do not edit'); if (isset($data)) { diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index af57e4d8ab..817769a590 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -1127,7 +1127,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase */ public function testGetBinaryAndBlobColumn() { - $GLOBALS['cfg']['ProtectBinary'] = true; + $GLOBALS['cfg']['ProtectBinary'] = 'blob'; $column['is_blob'] = true; $column['Field_md5'] = '123'; $column['pma_type'] = 'blob';