added suggestions
authorPhilipp Holzer <admin+github@philipp.info>
Sun, 26 May 2019 19:53:24 +0000 (21:53 +0200)
committerPhilipp Holzer <admin+github@philipp.info>
Sun, 26 May 2019 19:53:24 +0000 (21:53 +0200)
mod/uexport.php
src/Core/UserImport.php

index 2580a4a..dfeb25a 100644 (file)
@@ -12,6 +12,7 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 
 function uexport_init(App $a) {
+       /// @todo Don't forget to move this global field as static field in src/Modules
        global $dbStructure;
 
        if (!local_user()) {
@@ -74,7 +75,7 @@ function _uexport_multirow($query) {
                        foreach ($rr as $k => $v) {
                                switch ($dbStructure[$table]['fields'][$k]['type']) {
                                        case 'datetime':
-                                               $p[$k] = !empty($v) ? $v : DBA::NULL_DATETIME;
+                                               $p[$k] = $v ?? DBA::NULL_DATETIME;
                                                break;
                                        default:
                                                $p[$k] = $v;
@@ -101,7 +102,7 @@ function _uexport_row($query) {
                        foreach ($rr as $k => $v) {
                                switch ($dbStructure[$table]['fields'][$k]['type']) {
                                        case 'datetime':
-                                               $result[$k] = !empty($v) ? $v : DBA::NULL_DATETIME;
+                                               $result[$k] = $v ?? DBA::NULL_DATETIME;
                                                break;
                                        default:
                                                $result[$k] = $v;
index 8d02fb4..97a6e60 100644 (file)
@@ -53,7 +53,7 @@ class UserImport
                        }
 
                        if ($ttype[$icol] === 'datetime') {
-                               $arr[$icol] = !empty($ival) ? $ival : DBA::NULL_DATETIME;
+                               $arr[$icol] = $ival ?? DBA::NULL_DATETIME;
                        }
                }
        }