From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 8 Nov 2013 21:42:48 +0000 (+0100)
Subject: Fixed import issue
X-Git-Tag: 2.0.0_RC_2~44
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c8596be29d47cfabaa401cef58ba23d85d11e08;p=GitHub%2FWoltLab%2FWCF.git

Fixed import issue

Closes #1550
---

diff --git a/wcfsetup/install/files/lib/system/importer/UserImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserImporter.class.php
index be5c534a34..0ed9163d1b 100644
--- a/wcfsetup/install/files/lib/system/importer/UserImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/UserImporter.class.php
@@ -139,7 +139,10 @@ class UserImporter extends AbstractImporter {
 			}
 		}
 		
-		$groupIDs = array_merge($groupIDs, UserGroup::getGroupIDsByType(array(UserGroup::EVERYONE, UserGroup::USERS)));
+		if (!$user->activationCode) $defaultGroupIDs = UserGroup::getGroupIDsByType(array(UserGroup::EVERYONE, UserGroup::USERS));
+		else $defaultGroupIDs = UserGroup::getGroupIDsByType(array(UserGroup::EVERYONE, UserGroup::GUESTS));
+		
+		$groupIDs = array_merge($groupIDs, $defaultGroupIDs);
 		$sql = "INSERT IGNORE INTO	wcf".WCF_N."_user_to_group
 						(userID, groupID)
 			VALUES			(?, ?)";