From efcec72bb2994a220c7885c5b6855a934e80b52d Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 3 Aug 2013 18:06:54 +0200
Subject: [PATCH] convert from iso-8859-1 if not utf8
---
lib/plugins/usermanager/admin.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 395b91053..4c555ba67 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -759,6 +759,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
$fd = fopen($_FILES['import']['tmp_name'],'r');
if ($fd) {
while($csv = fgets($fd)){
+ if (!utf8_check($csv)) {
+ $csv = utf8_encode($csv);
+ }
$raw = str_getcsv($csv);
$error = ''; // clean out any errors from the previous line
// data checks...
--
GitLab