Merge pull request #23 from Indicia-Team/hotfix-import_rule_encoding

Diacritics allowed in record cleaner rule files.
Indicia-Team · Oct 8, 2015 · 4ef3401 · 4ef3401
2 parents f245b6a + 6cafb5b
commit 4ef3401
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/application/config/version.php b/application/config/version.php
@@ -26,7 +26,7 @@
 /**
  * @var string The application files version number.
  */
-$config['version'] = '0.9.1.6';
+$config['version'] = '0.9.1.7';
 $config['release_date']  = '2015-10-08';
 $config['repository'] = 'https://github.com/Indicia-Team/warehouse/releases';
 

diff --git a/modules/data_cleaner/controllers/verification_rule.php b/modules/data_cleaner/controllers/verification_rule.php
@@ -386,6 +386,9 @@ private function internal_upload_rule_file($totaldone, $cacheArr) {
       throw new exception("Could not open file $filepath");
     }
     $filecontent = fread($resource,1000000);
+    // if no BOM, not unicode, so convert for safety. See Warehouse issue 22.
+    if (strpos($filecontent, "\xEF\xBB\xBF")!==0) 
+	    $filecontent = utf8_encode($filecontent);
     $settings = data_cleaner::parse_test_file($filecontent);
     $this->read_rule_content($settings, $cacheArr['files'][$totaldone]['path'], $cacheArr['files'][$totaldone]['source_url']);
     return $cacheArr['files'][$totaldone]['display'];