diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 20:01:59 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 20:01:59 +0000 |
| commit | b6aaba915151dd07800761a01b67ffffaee1302b (patch) | |
| tree | 53c30035411460270278943f2427405233b34fac /mod/groups | |
| parent | ffbd7cd4179a0186dc674c2d24f578660cc75df0 (diff) | |
| download | elgg-b6aaba915151dd07800761a01b67ffffaee1302b.tar.gz elgg-b6aaba915151dd07800761a01b67ffffaee1302b.tar.bz2 | |
merge -r5898:5928 (not excluding riverdashboard, notifications, and messageboard) from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6058 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups')
| -rw-r--r-- | mod/groups/forum.php | 10 | ||||
| -rw-r--r-- | mod/groups/views/default/forum/topics.php | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mod/groups/forum.php b/mod/groups/forum.php index a19d86a0b..a8a4d391e 100644 --- a/mod/groups/forum.php +++ b/mod/groups/forum.php @@ -1,7 +1,7 @@ <?php /** * Elgg groups forum - * + * * @package ElggGroups * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 * @author Curverider @@ -11,8 +11,11 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - set_page_owner((int)get_input('group_guid')); - if (!(page_owner_entity() instanceof ElggGroup)) forward(); + $group_guid = (int)get_input('group_guid'); + set_page_owner($group_guid); + if (!(page_owner_entity() instanceof ElggGroup)) { + forward(); + } group_gatekeeper(); @@ -21,7 +24,6 @@ set_context('search'); // set up breadcrumbs - $group_guid = get_input('group_guid'); $group = get_entity($group_guid); elgg_push_breadcrumb(elgg_echo('groups'), $CONFIG->wwwroot."pg/groups/world/"); elgg_push_breadcrumb($group->name, $group->getURL()); diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php index 821e398e1..6280fe31a 100644 --- a/mod/groups/views/default/forum/topics.php +++ b/mod/groups/views/default/forum/topics.php @@ -18,7 +18,7 @@ if(page_owner_entity()->isMember($vars['user'])) { ?> <div class="content_header_options"> - <a class="action_button" href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo get_input('group_guid'); ?>"><?php echo elgg_echo("groups:addtopic"); ?></a> + <a class="action_button" href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo vars('group_guid'); ?>"><?php echo elgg_echo("groups:addtopic"); ?></a> </div> <?php } |