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

Fix conflict between URL parameter and POST parameter with groups

Browse Source 
Group edit page is at /group/:nickname/edit. There's also a form
parameter named 'nickname'. The two were conflicting.

I changed the form parameter to 'newnickname' and it works.

I'm not sure how this ever worked before, though.
This commit is contained in:
Evan Prodromou 2011-09-30 11:48:00 -04:00
parent 794dea4894
commit 636455ad82
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/editgroup.php
View File

@ -159,7 +159,7 @@ class EditgroupAction extends GroupAction
function showScripts() function showScripts()
{ {
parent::showScripts(); parent::showScripts();
$this->autofocus('nickname'); $this->autofocus('newnickname');
} }
function trySave() function trySave()
@ -173,7 +173,7 @@ class EditgroupAction extends GroupAction
if (Event::handle('StartGroupSaveForm', array($this))) { if (Event::handle('StartGroupSaveForm', array($this))) {
$nickname = Nickname::normalize($this->trimmed('nickname')); $nickname = Nickname::normalize($this->trimmed('newnickname'));
$fullname = $this->trimmed('fullname'); $fullname = $this->trimmed('fullname');
$homepage = $this->trimmed('homepage'); $homepage = $this->trimmed('homepage');
$description = $this->trimmed('description'); $description = $this->trimmed('description');

2
actions/newgroup.php
View File

@ -122,7 +122,7 @@ class NewgroupAction extends Action
{ {
if (Event::handle('StartGroupSaveForm', array($this))) { if (Event::handle('StartGroupSaveForm', array($this))) {
try { try {
$nickname = Nickname::normalize($this->trimmed('nickname')); $nickname = Nickname::normalize($this->trimmed('newnickname'));
} catch (NicknameException $e) { } catch (NicknameException $e) {
$this->showForm($e->getMessage()); $this->showForm($e->getMessage());
} }

4
lib/groupeditform.php
View File

@ -144,8 +144,8 @@ class GroupEditForm extends Form
$this->out->elementStart('li'); $this->out->elementStart('li');
$this->out->hidden('groupid', $id); $this->out->hidden('groupid', $id);
// TRANS: Field label on group edit form. // TRANS: Field label on group edit form.
$this->out->input('nickname', _('Nickname'), $this->out->input('newnickname', _('Nickname'),
($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname, ($this->out->arg('newnickname')) ? $this->out->arg('newnickname') : $nickname,
// TRANS: Field title on group edit form. // TRANS: Field title on group edit form.
_('1-64 lowercase letters or numbers, no punctuation or spaces.')); _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
$this->out->elementEnd('li'); $this->out->elementEnd('li');