Fixed regression that required for plans to be always there

StartupAPI · Jun 1, 2014 · 8501599 · 8501599
1 parent b3fb6fb
commit 8501599
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/classes/User.php b/classes/User.php
@@ -518,6 +518,7 @@ private function init() {
 		}
 
 		$invitation_account = null;
+		$plan = null;
 		if (!is_null($invitation)) {
 			$invitation_account = $invitation->getAccount();
 
@@ -528,11 +529,12 @@ private function init() {
 			) {
 				$invitation_account->addUser($this);
 			}
+
+			$plan = $invitation->getPlan();
 		}
 
 		$new_user_account = null;
 		if (is_null($invitation_account) || UserConfig::$createPersonalAccountsIfInvitedToGroupAccount) {
-			$plan = $invitation->getPlan();
 			if ($plan) {
 				$new_user_account = Account::createAccount($this->name, $plan->getSlug(), null, $this, Account::ROLE_ADMIN);
 			} else {