Merge branch 'master' of git.gnu.io:Quix0r/gnu-social

[quix0rs-gnu-social.git] / plugins / TwitterBridge / actions / twitterauthorization.php

diff --git a/plugins/TwitterBridge/actions/twitterauthorization.php b/plugins/TwitterBridge/actions/twitterauthorization.php
index ce6af091e2d5adcd61a8ccca503ad024417e7b52..8fa4df44726074adad35fd2a83597882415ad003 100644 (file)
--- a/plugins/TwitterBridge/actions/twitterauthorization.php
+++ b/plugins/TwitterBridge/actions/twitterauthorization.php
@@ -28,9 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
 
 require_once dirname(__DIR__) . '/twitter.php';
 
@@ -65,7 +63,7 @@ class TwitterauthorizationAction extends Action
      *
      * @return boolean true
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -83,7 +81,7 @@ class TwitterauthorizationAction extends Action
      *
      * @return nothing
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -535,11 +533,10 @@ class TwitterauthorizationAction extends Action
             $args['email'] = $email;
         }
 
-        $user = User::register($args);
-
-        if (empty($user)) {
-            // TRANS: Server error displayed when creating a new user has failed.
-            $this->serverError(_m('Error registering user.'));
+        try {
+            $user = User::register($args);
+        } catch (Exception $e) {
+            $this->serverError($e->getMessage());
         }
 
         $result = $this->saveForeignLink($user->id,