aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-20 14:59:56 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-20 14:59:56 +0000
commit34625fc95c5e2250ed68abd94c28dccd16438759 (patch)
tree0474c955adee014d40a1ccaf7e383ad6b88dbc26 /mod
parentd928588805375e7190ab393e2def555b39701a27 (diff)
downloadelgg-34625fc95c5e2250ed68abd94c28dccd16438759.tar.gz
elgg-34625fc95c5e2250ed68abd94c28dccd16438759.tar.bz2
Fixes #3364: Added action tokens and fixed guids for featuring/unfeaturing groups. Cleaned up language for result messages.
git-svn-id: http://code.elgg.org/elgg/trunk@9006 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/groups/actions/groups/featured.php21
-rw-r--r--mod/groups/languages/en.php5
-rw-r--r--mod/groups/start.php7
3 files changed, 18 insertions, 15 deletions
diff --git a/mod/groups/actions/groups/featured.php b/mod/groups/actions/groups/featured.php
index 2d623b1e4..4cb9f8122 100644
--- a/mod/groups/actions/groups/featured.php
+++ b/mod/groups/actions/groups/featured.php
@@ -10,17 +10,18 @@ $action = get_input('action_type');
$group = get_entity($group_guid);
-if ($group) {
- //get the action, is it to feature or unfeature
- if ($action == "feature") {
- $group->featured_group = "yes";
- system_message(elgg_echo('groups:featuredon'));
- }
+if (!elgg_instanceof($group, 'group')) {
+ register_error(elgg_echo('groups:featured_error'));
+ forward(REFERER);
+}
- if ($action == "unfeature") {
- $group->featured_group = "no";
- system_message(elgg_echo('groups:unfeatured'));
- }
+//get the action, is it to feature or unfeature
+if ($action == "feature") {
+ $group->featured_group = "yes";
+ system_message(elgg_echo('groups:featuredon', array($group->name)));
+} else {
+ $group->featured_group = "no";
+ system_message(elgg_echo('groups:unfeatured', array($group->name)));
}
forward(REFERER);
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index dc65244fd..63a6df3a9 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -45,8 +45,9 @@ $english = array(
'groups:featured' => 'Featured groups',
'groups:makeunfeatured' => 'Unfeature',
'groups:makefeatured' => 'Make featured',
- 'groups:featuredon' => 'You have made this group a featured one.',
- 'groups:unfeatured' => 'You have removed this group from the featured list',
+ 'groups:featuredon' => '%s is now a featured group.',
+ 'groups:unfeatured' => '%s has been removed from the featured groups.',
+ 'groups:featured_error' => 'Invalid group.',
'groups:joinrequest' => 'Request membership',
'groups:join' => 'Join group',
'groups:leave' => 'Leave group',
diff --git a/mod/groups/start.php b/mod/groups/start.php
index ee99ac9b4..9de7f1cc1 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -346,11 +346,11 @@ function groups_entity_menu_setup($hook, $type, $return, $params) {
// feature link
if (elgg_is_admin_logged_in()) {
- if ($group->featured_group == "yes") {
- $url = "action/groups/featured?group_guid={$group->guid}&action_type=unfeature";
+ if ($entity->featured_group == "yes") {
+ $url = "action/groups/featured?group_guid={$entity->guid}&action_type=unfeature";
$wording = elgg_echo("groups:makeunfeatured");
} else {
- $url = "action/groups/featured?group_guid={$group->guid}&action_type=feature";
+ $url = "action/groups/featured?group_guid={$entity->guid}&action_type=feature";
$wording = elgg_echo("groups:makefeatured");
}
$options = array(
@@ -358,6 +358,7 @@ function groups_entity_menu_setup($hook, $type, $return, $params) {
'text' => $wording,
'href' => $url,
'priority' => 300,
+ 'is_action' => true
);
$return[] = ElggMenuItem::factory($options);
}