diff options
author | Andreas Gohr <andi@splitbrain.org> | 2024-11-25 13:21:44 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2024-11-25 13:21:44 +0100 |
commit | abc2dfe1c47370cc3f853e291ccce8107d23f35d (patch) | |
tree | ec7999b92764c4c5976e96c16c083df7fea54cbc /lib | |
parent | a646a37b3a8a80e780de8ad5cacd58b7f3248acf (diff) | |
download | dokuwiki-abc2dfe1c47370cc3f853e291ccce8107d23f35d.tar.gz dokuwiki-abc2dfe1c47370cc3f853e291ccce8107d23f35d.zip |
user manager: explicitly set CSV parameters
This is needed since PHP 8.4
Diffstat (limited to 'lib')
-rw-r--r-- | lib/plugins/usermanager/admin.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 09460fc01..16cf96198 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -1036,10 +1036,10 @@ class admin_plugin_usermanager extends AdminPlugin // output the csv $fd = fopen('php://output', 'w'); - fputcsv($fd, $column_headings); + fputcsv($fd, $column_headings, ',', '"', "\\"); foreach ($user_list as $user => $info) { $line = [$user, $info['name'], $info['mail'], implode(',', $info['grps'])]; - fputcsv($fd, $line); + fputcsv($fd, $line, ',', '"', "\\"); } fclose($fd); if (defined('DOKU_UNITTEST')) { @@ -1081,7 +1081,7 @@ class admin_plugin_usermanager extends AdminPlugin if (!Clean::isUtf8($csv)) { $csv = Conversion::fromLatin1($csv); } - $raw = str_getcsv($csv); + $raw = str_getcsv($csv, ',', '"', "\\"); $error = ''; // clean out any errors from the previous line // data checks... if (1 == ++$line) { |