Merged group featuring fixes to trunk [6493]

git-svn-id: http://code.elgg.org/elgg/trunk@6513 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/groups/actions/featured.php b/mod/groups/actions/featured.php
index c6fc9f39711c0fde6c2cf643cb46eb5a7b547bca..7bc7acdd60dcec57a3ff0c956637d5866c7965e4 100644 (file)
--- a/mod/groups/actions/featured.php
+++ b/mod/groups/actions/featured.php
@@ -16,7 +16,7 @@
        admin_gatekeeper();
        
        $group_guid = get_input('group_guid');
-       $action = get_input('type');
+       $action = get_input('action_type');
        
        $group = get_entity($group_guid);
        

diff --git a/mod/groups/views/default/groups/grouplisting.php b/mod/groups/views/default/groups/grouplisting.php
index 83350889c08cac38c2c570fc2ea25977c6bdea3a..48a7b1ace26b03d64e71857e83944f1da286b8da 100644 (file)
--- a/mod/groups/views/default/groups/grouplisting.php
+++ b/mod/groups/views/default/groups/grouplisting.php
@@ -30,10 +30,10 @@ $info .= "<p class='entity_subtext groups'>" . $mem . " / <b>" . get_group_membe
 //for admins only - display the feature or unfeature option
 if(isadminloggedin()) {
        if($vars['entity']->featured_group == "yes"){
-               $url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&type=unfeature");
+               $url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action_type=unfeature");
                $wording = elgg_echo("groups:makeunfeatured");
        }else{
-               $url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&type=feature");
+               $url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action_type=feature");
                $wording = elgg_echo("groups:makefeatured");
        }
        // display 'make featured' option