diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-08-03 18:06:54 +0200 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-08-03 18:06:54 +0200 |
| commit | efcec72bb2994a220c7885c5b6855a934e80b52d (patch) | |
| tree | a77b7a2d0429b9e2e45abeb60564c4130c4d1399 /lib/plugins/usermanager/admin.php | |
| parent | c4d11518ab222262dd0a974b9db5228ccb5df9d7 (diff) | |
| download | rpg-efcec72bb2994a220c7885c5b6855a934e80b52d.tar.gz rpg-efcec72bb2994a220c7885c5b6855a934e80b52d.tar.bz2 | |
convert from iso-8859-1 if not utf8
Diffstat (limited to 'lib/plugins/usermanager/admin.php')
| -rw-r--r-- | lib/plugins/usermanager/admin.php | 3 |
1 files changed, 3 insertions, 0 deletions
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... |