Merge branch '3.0'

diff --cc files/lib/system/exporter/SMF2xExporter.class.php
index a56527dae304aa987b2aeb7629da10ca3ac8a4f1,cbed0e9f82a07fa4692f721235296a8775cd0e3c..cf06f9134fdc86bc4f82185d8984123fbc4208af
--- 1/files/lib/system/exporter/SMF2xExporter.class.php
--- 2/files/lib/system/exporter/SMF2xExporter.class.php
+++ b/files/lib/system/exporter/SMF2xExporter.class.php
@@@ -942,11 -941,7 +942,11 @@@ class SMF2xExporter extends AbstractExp
                $statement = $this->database->prepareStatement($sql, $limit, $offset);
                $statement->execute([0, 0]);
                while ($row = $statement->fetchArray()) {
-                       $fileLocation = $this->getAttachmentFilename($row['id_attach'], $row['id_folder'], $row['file_hash']);
 +                      if (substr($row['filename'], -6) == '_thumb') {
 +                              continue; // ignore thumbnails
 +                      }
 +                      
+                       $fileLocation = $this->getAttachmentFilename($row['id_attach'], $row['id_folder'], $row['file_hash'], $row['filename']);
                        
                        if ($imageSize = @getimagesize($fileLocation)) {
                                $row['isImage'] = 1;