From: Tim Otten <totten@civicrm.org>
Date: Tue, 4 Mar 2014 01:37:01 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-03-17-36-50
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ba4d65467bdf14b7ac4d5efce468f5e4867129f9;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-03-17-36-50
---

ba4d65467bdf14b7ac4d5efce468f5e4867129f9
diff --cc install/civicrm.php
index c4063acb9a,b91f804906..adedfb9b7d
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@@ -123,8 -130,9 +123,10 @@@ function civicrm_source($dsn, $fileName
    if (PEAR::isError($db)) {
      die("Cannot open $dsn: " . $db->getMessage());
    }
 +  $db->query("SET NAMES utf8");
  
+   $db->query("SET NAMES utf8");
+ 
    if (!$lineMode) {
      $string = file_get_contents($fileName);