Merge pull request #8936 from cividesk/CRM-19261-4.7

CRM-19261: full fix

diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
index 087a484746cefe75a1566bfba7f159c524110710..c8f322b43728c03212ca7ee1edb8588738205309 100644 (file)
--- a/CRM/Utils/File.php
+++ b/CRM/Utils/File.php
@@ -310,6 +310,7 @@ class CRM_Utils_File {
     if (CRM_Utils_Constant::value('CIVICRM_MYSQL_STRICT', CRM_Utils_System::isDevelopment())) {
       $db->query('SET SESSION sql_mode = STRICT_TRANS_TABLES');
     }
+    $db->query('SET NAMES utf8');
 
     if (!$isQueryString) {
       $string = $prefix . file_get_contents($fileName);