Merge branch 'master' of git://github.com/StartupAPI/users

StartupAPI · Jun 18, 2014 · 76a1768 · 76a1768
2 parents c89bee4 + 4e76a25
commit 76a1768
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
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 {

diff --git a/modules/facebook/facebook-sprite.png b/modules/facebook/facebook-sprite.png
diff --git a/modules/facebook/index.php b/modules/facebook/index.php
@@ -240,11 +240,11 @@ public function renderAutoLogoutForm() {
 	private function renderForm($action, $form) {
 		if ($form == 'login') {
 			$formsubmit = 'login';
-			$buttonspritestyle = 'background-position: 0px -22px; width: 198px; height: 22px;';
+			$buttonspritestyle = 'background-position: 0px -22px; width: 147px; height: 22px;';
 			$buttontitle = 'Login with Facebook';
 		} else if ($form == 'register') {
 			$formsubmit = 'register';
-			$buttonspritestyle = 'background-position: 0px 0px; width: 250px; height: 22px;';
+			$buttonspritestyle = 'background-position: 0px 0px; width: 200px; height: 22px;';
 			$buttontitle = 'Quick Sign-up using Facebook';
 		} else if ($form == 'connect') {
 			$formsubmit = 'save';

diff --git a/modules/linkedin/linkedin-small.png b/modules/linkedin/linkedin-small.png