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

Fix ticket #3016: when using non-AJAX form of the ostatus subscription initiation for non-local group joins, show the "group" field instead of a blank "user" field

Browse Source
This commit is contained in:
Brion Vibber
2011-01-26 14:57:52 -08:00
parent 621a7cb36d
commit c65480fb33
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/OStatus/actions/ostatusinit.php
View File

@@ -114,10 +114,15 @@ class OStatusInitAction extends Action
$this->elementStart('ul', 'form_data');
$this->elementStart('li', array('id' => 'ostatus_nickname'));
// TRANS: Field label.
$this->input('nickname', _m('User nickname'), $this->nickname,
_m('Nickname of the user you want to follow.'));
$this->hidden('group', $this->group); // pass-through for magic links
if ($this->group) {
// TRANS: Field label.
$this->input('group', _m('Group nickname'), $this->group,
_m('Nickname of the group you want to join.'));
} else {
// TRANS: Field label.
$this->input('nickname', _m('User nickname'), $this->nickname,
_m('Nickname of the user you want to follow.'));
}
$this->elementEnd('li');
$this->elementStart('li', array('id' => 'ostatus_profile'));
// TRANS: Field label.