From 43c4b6fb806dea867ed7a7c16f9dc85b0311d2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Schleu=C3=9Fer?= Date: Wed, 22 Mar 2017 15:32:30 +0100 Subject: [PATCH] mssql: don't encode contents when uploading attachments Downloads are broken and inline preview doesn't work. Move "case 'mssqlnative':" down next to 'oci8' in db_prepare_binary_string (database_api) to effectively return the string unchanged via 'default:'. Adjust comment. Fixes #22208 Signed-off-by: Damien Regad --- core/database_api.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/database_api.php b/core/database_api.php index 920850eb10..a2501e3f12 100644 --- a/core/database_api.php +++ b/core/database_api.php @@ -772,7 +772,6 @@ function db_prepare_binary_string( $p_string ) { switch( $t_db_type ) { case 'mssql': - case 'mssqlnative': case 'odbc_mssql': case 'ado_mssql': $t_content = unpack( 'H*hex', $p_string ); @@ -784,8 +783,9 @@ function db_prepare_binary_string( $p_string ) { case 'pgsql': return $g_db->BlobEncode( $p_string ); break; + case 'mssqlnative': case 'oci8': - # Fall through, oci8 stores raw data in BLOB + # Fall through, mssqlnative, oci8 store raw data in BLOB default: return $p_string; break;