Merge branch '2020.09-rc' into stable

[friendica.git] / src / Module / Settings / UserExport.php

diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index a1ea50353dc630798d6798d8072c6a12ae907321..132505371ecbd8477d91d68812c2e545cacb3d69 100644 (file)
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file src/Modules/Settings/UserExport.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Module\Settings;
@@ -98,14 +114,11 @@ class UserExport extends BaseSettings
                $rows = DBA::p($query);
                while ($row = DBA::fetch($rows)) {
                        $p = [];
-                       foreach ($row as $k => $v) {
-                               switch ($dbStructure[$table]['fields'][$k]['type']) {
-                                       case 'datetime':
-                                               $p[$k] = $v ?? DBA::NULL_DATETIME;
-                                               break;
-                                       default:
-                                               $p[$k] = $v;
-                                               break;
+                       foreach ($dbStructure[$table]['fields'] as $column => $field) {
+                               if ($field['type'] == 'datetime') {
+                                       $p[$column] = $v ?? DBA::NULL_DATETIME;
+                               } else {
+                                       $p[$column] = $v;
                                }
                        }
                        $result[] = $p;