Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
#	files/lib/system/exporter/IPB4xExporter.class.php
#	files/lib/system/exporter/WBB4xExporter.class.php

diff --cc files/lib/system/exporter/IPB3xExporter.class.php
Simple merge

diff --cc files/lib/system/exporter/IPB4xExporter.class.php
index 2687be15c51ec7f2d30e35fa45c52fccbf3fd5f2,a35b6a38ebc96594a4dc6e3213e792d62ca389d6..be048204ee7205acd48981bb5498bb82432a45b5
--- 1/files/lib/system/exporter/IPB4xExporter.class.php
--- 2/files/lib/system/exporter/IPB4xExporter.class.php
+++ b/files/lib/system/exporter/IPB4xExporter.class.php
@@@ -686,13 -645,13 +686,13 @@@ class IPB4xExporter extends AbstractExp
                                'username' => $row['starter_name'],
                                'views' => $row['views'],
                                'isSticky' => $row['pinned'],
 -                              'isDisabled' => ($row['approved'] == 0 ? 1 : 0),
 -                              'isClosed' => ($row['state'] == 'close' ? 1 : 0),
 -                              'movedThreadID' => ($row['moved_to'] ? intval($row['moved_to']) : null),
 +                              'isDisabled' => $row['approved'] == 0 ? 1 : 0,
 +                              'isClosed' => $row['state'] == 'close' ? 1 : 0,
 +                              'movedThreadID' => $row['moved_to'] ? intval($row['moved_to']) : null,
                                'movedTime' => $row['moved_on'],
-                               'lastPostTime' => $row['last_post']
+                               'lastPostTime' => ($row['last_post'] ?: 0)
 -                      );
 -                      $additionalData = array();
 +                      ];
 +                      $additionalData = [];
                        if (isset($tags[$row['tid']])) $additionalData['tags'] = $tags[$row['tid']];
                                
                        ImportHandler::getInstance()->getImporter('com.woltlab.wbb.thread')->import($row['tid'], $data, $additionalData);