* @link http://status.net/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+require_once dirname(__DIR__) . '/twitter.php';
/**
* Class for doing OAuth authentication against Twitter
*
* @return boolean true
*/
- function prepare($args)
+ function prepare(array $args=array())
{
parent::prepare($args);
*
* @return nothing
*/
- function handle($args)
+ function handle(array $args=array())
{
parent::handle($args);
$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,