aboutsummaryrefslogtreecommitdiff
path: root/mod/bookmarks
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-06-03 01:40:06 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-06-03 01:40:06 +0000
commite8da61b8e8654caa45a5315ce338886e802f044d (patch)
tree0088c353bd748943036f29e0df9139decb6af29e /mod/bookmarks
parent33f7cec924ff46d5f890130393fe023d2ddd6100 (diff)
downloadelgg-e8da61b8e8654caa45a5315ce338886e802f044d.tar.gz
elgg-e8da61b8e8654caa45a5315ce338886e802f044d.tar.bz2
Fixes #3138 using 'all' for group listing urls
git-svn-id: http://code.elgg.org/elgg/trunk@9133 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/bookmarks')
-rw-r--r--mod/bookmarks/actions/bookmarks/delete.php2
-rw-r--r--mod/bookmarks/pages/bookmarks/view.php2
-rw-r--r--mod/bookmarks/start.php4
-rw-r--r--mod/bookmarks/views/default/bookmarks/group_module.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/mod/bookmarks/actions/bookmarks/delete.php b/mod/bookmarks/actions/bookmarks/delete.php
index 410a67bb7..2e9f41438 100644
--- a/mod/bookmarks/actions/bookmarks/delete.php
+++ b/mod/bookmarks/actions/bookmarks/delete.php
@@ -13,7 +13,7 @@ if (elgg_instanceof($bookmark, 'object', 'bookmarks') && $bookmark->canEdit()) {
if ($bookmark->delete()) {
system_message(elgg_echo("bookmarks:delete:success"));
if (elgg_instanceof($container, 'group')) {
- forward("bookmarks/group/$container->guid/owner");
+ forward("bookmarks/group/$container->guid/all");
} else {
forward("bookmarks/owner/$container->username");
}
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 142e0b246..d0a9c630a 100644
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -12,7 +12,7 @@ $page_owner = elgg_get_page_owner_entity();
$crumbs_title = $page_owner->name;
if (elgg_instanceof($page_owner, 'group')) {
- elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/owner");
+ elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/all");
} else {
elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_owner->username");
}
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 2dc86bc1a..1fb79deb6 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -77,7 +77,7 @@ function bookmarks_init() {
* View bookmark: bookmarks/view/<guid>/<title>
* New bookmark: bookmarks/add/<guid> (container: user, group, parent)
* Edit bookmark: bookmarks/edit/<guid>
- * Group bookmarks: bookmarks/group/<guid>/owner
+ * Group bookmarks: bookmarks/group/<guid>/all
* Bookmarklet: bookmarks/bookmarklet/<guid> (user)
*
* Title is ignored
@@ -222,7 +222,7 @@ function bookmarks_owner_block_menu($hook, $type, $return, $params) {
$return[] = $item;
} else {
if ($params['entity']->bookmarks_enable != 'no') {
- $url = "bookmarks/group/{$params['entity']->guid}/owner";
+ $url = "bookmarks/group/{$params['entity']->guid}/all";
$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks:group'), $url);
$return[] = $item;
}
diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
index ff85c23ff..3166fc0f0 100644
--- a/mod/bookmarks/views/default/bookmarks/group_module.php
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -12,7 +12,7 @@ if ($group->bookmarks_enable == "no") {
}
$all_link = elgg_view('output/url', array(
- 'href' => "bookmarks/group/$group->guid/owner",
+ 'href' => "bookmarks/group/$group->guid/all",
'text' => elgg_echo('link:view:all'),
));