diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-06-18 02:02:43 -0700 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-06-18 02:02:43 -0700 |
commit | 2f36604ddfe7cb7987201a53ad75099d7b94a936 (patch) | |
tree | dc08222b3e24b7dba38203f49f5cc66da23a63db /actions/editgroup.php | |
parent | 2b3746013eb5daa323b2740d30e222f0d88c2d9c (diff) | |
parent | 57274d21ba554e43c6fcd90555388a60d3de014d (diff) |
Merge branch 'groupdesign' into 0.8.x
* groupdesign:
Group theming.
Add design_id to User_group
Diffstat (limited to 'actions/editgroup.php')
-rw-r--r-- | actions/editgroup.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/editgroup.php b/actions/editgroup.php index 29a7bce43..6aa6f8b11 100644 --- a/actions/editgroup.php +++ b/actions/editgroup.php @@ -23,6 +23,7 @@ * @package Laconica * @author Evan Prodromou <evan@controlyourself.ca> * @author Sarven Capadisli <csarven@controlyourself.ca> + * @author Zach Copley <zach@controlyourself.ca> * @copyright 2008-2009 Control Yourself, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://laconi.ca/ @@ -40,14 +41,15 @@ if (!defined('LACONICA')) { * @category Group * @package Laconica * @author Evan Prodromou <evan@controlyourself.ca> + * @author Zach Copley <zach@controlyourself.ca> * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://laconi.ca/ */ -class EditgroupAction extends Action +class EditgroupAction extends GroupDesignAction { + var $msg; - var $group = null; function title() { |