GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' into testing

Browse Source
This commit is contained in:
Evan Prodromou 2011-06-10 17:46:44 -04:00
commit 527ed62f3f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
View File

@ -241,7 +241,7 @@ class DomainStatusNetworkPlugin extends Plugin
return !empty($user); return !empty($user);
} }
static function registerEmail($email, $sendWelcome, $template) static function registerEmail($email)
{ {
$domain = self::toDomain($email); $domain = self::toDomain($email);

3
plugins/DomainStatusNetwork/actions/globalregister.php
View File

@ -81,7 +81,8 @@ class GlobalregisterAction extends GlobalApiAction
function handle($argarray=null) function handle($argarray=null)
{ {
try { try {
DomainStatusNetworkPlugin::registerEmail($this->email, true); $confirm = DomainStatusNetworkPlugin::registerEmail($this->email);
EmailRegistrationPlugin::sendConfirmEmail($confirm);
$this->showSuccess(); $this->showSuccess();
} catch (ClientException $e) { } catch (ClientException $e) {
$this->showError($e->getMessage(), $e->getCode()); $this->showError($e->getMessage(), $e->getCode());