diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-22 16:56:55 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-22 16:56:55 +0000 |
| commit | 1d33c3fd07fbfa41359af0e99079f57f022e7124 (patch) | |
| tree | 7c8a11ab79801d4545aa8ca6ec8be1f231b2b287 /mod/groups/views/default | |
| parent | a140ef9c53edb2e249eab2eafccc6eb8c0952dab (diff) | |
| download | elgg-1d33c3fd07fbfa41359af0e99079f57f022e7124.tar.gz elgg-1d33c3fd07fbfa41359af0e99079f57f022e7124.tar.bz2 | |
Merged 1.7 bugfixes back into core. (5376:HEAD).
git-svn-id: http://code.elgg.org/elgg/trunk@5471 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/views/default')
| -rw-r--r-- | mod/groups/views/default/groups/find.php | 6 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/invitationrequests.php | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/find.php index 5032a74fb..534469052 100644 --- a/mod/groups/views/default/groups/find.php +++ b/mod/groups/views/default/groups/find.php @@ -8,11 +8,7 @@ $tag_string = elgg_echo('groups:search:tags'); ?> <h3><?php echo elgg_echo('groups:searchtag'); ?></h3> -<form id="groupsearchform" action="<?php echo $vars['url']; ?>pg/search/" method="get"> +<form id="groupsearchform" action="<?php echo $vars['url']; ?>pg/groups/world/" method="get"> <input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" /> - <input type="hidden" name="entity_type" value="group" /> - <input type="hidden" name="subtype" value="" /> - <input type="hidden" name="tagtype" value="" /> - <input type="hidden" name="owner_guid" value="0" /> <input type="submit" value="<?php echo elgg_echo('go'); ?>" /> </form>
\ No newline at end of file diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index ddc8a057a..135bf1940 100644 --- a/mod/groups/views/default/groups/invitationrequests.php +++ b/mod/groups/views/default/groups/invitationrequests.php @@ -22,7 +22,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) { <?php echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array( 'href' => $vars['url'] . "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}", - 'confirm' => elgg_echo('groups:joinrequest:remove:check'), + 'confirm' => elgg_echo('groups:invite:remove:check'), 'text' => elgg_echo('delete'), ))); |