Merge branch '0.9.x' into testing

This commit is contained in:
Brion Vibber
2011-01-20 15:12:57 -08:00
76 changed files with 16204 additions and 12925 deletions

View File

@@ -232,6 +232,10 @@ class FBConnectauthAction extends Action
function createNewUser()
{
if (!Event::handle('StartRegistrationTry', array($this))) {
return;
}
if (common_config('site', 'closed')) {
// TRANS: Client error trying to register with registrations not allowed.
$this->clientError(_m('Registration not allowed.'));
@@ -297,6 +301,8 @@ class FBConnectauthAction extends Action
common_debug('Facebook Connect Plugin - ' .
"Registered new user $user->id from Facebook user $this->fbuid");
Event::handle('EndRegistrationTry', array($this));
common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
303);
}