From ee9e368aa8815500b1bdcaffc3a6022eabc732b9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 26 Jan 2011 14:57:52 -0800
Subject: [PATCH] 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
---
plugins/OStatus/actions/ostatusinit.php | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 91c36203c8..9832f33c05 100644
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -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.
--
2.39.5