Merge pull request #16877 from agileware/CIVICRM-1457

[civicrm-core.git] / install / civicrm.php

diff --git a/install/civicrm.php b/install/civicrm.php
index 0932b1902b58e85622a2632f580a9278ac00adea..e6886134039281a2c69874ea93a06aac6b3bad53 100644 (file)
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -12,8 +12,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
- * $Id$
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * @param $filesDirectory
  */
 function civicrm_setup($filesDirectory) {
@@ -145,9 +144,7 @@ function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
   if (PEAR::isError($db)) {
     die("Cannot open $dsn: " . $db->getMessage());
   }
-  $db->query("SET NAMES utf8");
-
-  $db->query("SET NAMES utf8");
+  $db->query('SET NAMES utf8mb4');
 
   if (!$lineMode) {
     $string = file_get_contents($fileName);
@@ -200,7 +197,7 @@ function civicrm_config(&$config) {
   global $tplPath, $installType;
 
   // Ex: $extraSettings[] = '$civicrm_settings["domain"]["foo"] = "bar";';
-  $extraSettings = array();
+  $extraSettings = [];
 
   $params = array(
     'crmRoot' => $crmPath,