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

Less frightening interface on remote subscription

Browse Source 
Instead of an error message in a red box about being unable to find the
profile, you get the title "Remote subscription" and no error message.
This commit is contained in:
Mikael Nordfeldth 2017-04-19 11:41:34 +02:00
parent 548e59fc99
commit e87115d462
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/OStatus/actions/ostatussub.php
View File

@ -245,8 +245,9 @@ class OStatusSubAction extends Action
try { try {
$this->profile_uri = Discovery::normalize($this->trimmed('profile')); $this->profile_uri = Discovery::normalize($this->trimmed('profile'));
} catch (Exception $e) { } catch (Exception $e) {
$this->profile_uri = null; return false;
} }
try { try {
if (Discovery::isAcct($this->profile_uri) && $validate->email(mb_substr($this->profile_uri, 5))) { if (Discovery::isAcct($this->profile_uri) && $validate->email(mb_substr($this->profile_uri, 5))) {
$this->oprofile = Ostatus_profile::ensureWebfinger($this->profile_uri); $this->oprofile = Ostatus_profile::ensureWebfinger($this->profile_uri);
@ -391,7 +392,7 @@ class OStatusSubAction extends Action
function title() function title()
{ {
// TRANS: Page title for OStatus remote subscription form. // TRANS: Page title for OStatus remote subscription form.
return _m('Confirm'); return !empty($this->profile_uri) ? _m('Confirm') : _m('Remote subscription');
} }
/** /**