Fixed import of conversation folders (XF 1.2)

diff --git a/files/lib/system/exporter/XF12xExporter.class.php b/files/lib/system/exporter/XF12xExporter.class.php
index 73191f735da8563f5dd38181854ea8430527364c..2e0030a6f019bda07d8bbe6648f6778cf6c10e51 100644 (file)
--- a/files/lib/system/exporter/XF12xExporter.class.php
+++ b/files/lib/system/exporter/XF12xExporter.class.php
@@ -637,7 +637,7 @@ class XF12xExporter extends AbstractExporter {
         * Counts conversation folders.
         */
        public function countConversationFolders() {
-               $this->countUsers();
+               return $this->countUsers();
        }
        
        /**
@@ -651,9 +651,9 @@ class XF12xExporter extends AbstractExporter {
                        FROM            xf_user
                        ORDER BY        user_id";
                $statement = $this->database->prepareStatement($sql, $limit, $offset);
-               $statement->execute(['']);
+               $statement->execute();
                while ($row = $statement->fetchArray()) {
-                       ImportHandler::getInstance()->getImporter('com.woltlab.wcf.conversation.label')->import($row['userid'], [
+                       ImportHandler::getInstance()->getImporter('com.woltlab.wcf.conversation.label')->import($row['user_id'], [
                                'userID' => $row['user_id'],
                                'label' => 'Star'
                        ]);