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

CancelGroupForm gets same typing as Join and Leave

This commit is contained in:
Mikael Nordfeldth 2016-01-09 14:13:19 +01:00
parent fbec7c4e75
commit 55aa68b941
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/cancelgroupform.php
View File

@ -28,11 +28,7 @@
* @link http://status.net/ * @link http://status.net/
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { if (!defined('GNUSOCIAL')) { exit(1); }
exit(1);
}
require_once INSTALLDIR.'/lib/form.php';
/** /**
* Form for leaving a group * Form for leaving a group
@ -58,10 +54,11 @@ class CancelGroupForm extends Form
/** /**
* Constructor * Constructor
* *
* @param HTMLOutputter $out output channel * @param HTMLOutputter $out output channel
* @param group $group group to leave * @param User_group $group group to leave
* @param Profile $profile User profile this is meant for
*/ */
function __construct($out=null, $group=null, $profile=null) function __construct(HTMLOutputter $out=null, User_group $group=null, Profile $profile=null)
{ {
parent::__construct($out); parent::__construct($out);
@ -76,7 +73,7 @@ class CancelGroupForm extends Form
*/ */
function id() function id()
{ {
return 'group-cancel-' . $this->group->id; return 'group-cancel-' . $this->group->getID();
} }
/** /**
@ -97,11 +94,10 @@ class CancelGroupForm extends Form
function action() function action()
{ {
$params = array(); $params = array();
if ($this->profile) { if ($this->profile instanceof Profile) {
$params['profile_id'] = $this->profile->id; $params['profile_id'] = $this->profile->getID();
} }
return common_local_url('cancelgroup', return common_local_url('cancelgroup', array('id' => $this->group->getID()), $params);
array('id' => $this->group->id), $params);
} }
/** /**

2
lib/groupaction.php
View File

@ -85,7 +85,7 @@ class GroupAction extends Action
$this->group = User_group::getKV('id', $local->group_id); $this->group = User_group::getKV('id', $local->group_id);
if (!$this->group) { if (!$this->group instanceof User_group) {
// TRANS: Client error displayed if no local group with a given name was found requesting group page. // TRANS: Client error displayed if no local group with a given name was found requesting group page.
$this->clientError(_('No such group.'), 404); $this->clientError(_('No such group.'), 404);
} }