Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-03-17-36-50
authorTim Otten <totten@civicrm.org>
Tue, 4 Mar 2014 01:37:01 +0000 (17:37 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 4 Mar 2014 01:37:01 +0000 (17:37 -0800)
1  2 
CRM/Core/Controller.php
install/civicrm.php

Simple merge
index c4063acb9a4120dcb92fae2529ee6aed9806e1e9,b91f8049067e42c720a33edbd7e9cd4a65b3a4ff..adedfb9b7d9880ca76bb5c199c1554ceebb9673a
@@@ -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);