From e8da61b8e8654caa45a5315ce338886e802f044d Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 3 Jun 2011 01:40:06 +0000
Subject: Fixes #3138 using 'all' for group listing urls

git-svn-id: http://code.elgg.org/elgg/trunk@9133 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/file/actions/file/delete.php             | 2 +-
 mod/file/actions/file/upload.php             | 2 +-
 mod/file/pages/file/search.php               | 2 +-
 mod/file/pages/file/upload.php               | 2 +-
 mod/file/pages/file/view.php                 | 2 +-
 mod/file/start.php                           | 4 ++--
 mod/file/views/default/file/group_module.php | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'mod/file')

diff --git a/mod/file/actions/file/delete.php b/mod/file/actions/file/delete.php
index 622d02277..72585aa36 100644
--- a/mod/file/actions/file/delete.php
+++ b/mod/file/actions/file/delete.php
@@ -27,7 +27,7 @@ if (!$file->delete()) {
 }
 
 if (elgg_instanceof($container, 'group')) {
-	forward("file/group/$container->guid/owner");
+	forward("file/group/$container->guid/all");
 } else {
 	forward("file/owner/$container->username");
 }
diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index e04203f67..5d5c28bee 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -192,7 +192,7 @@ if ($new_file) {
 	if (!$ajax) {
 		$container = get_entity($container_guid);
 		if (elgg_instanceof($container, 'group')) {
-			forward("file/group/$container->guid/owner");
+			forward("file/group/$container->guid/all");
 		} else {
 			forward("file/owner/$container->username");
 		}
diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 2fa1ea60f..77c92f444 100644
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -26,7 +26,7 @@ if ($owner) {
 	if (elgg_instanceof($owner, 'user')) {
 		elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 	} else {
-		elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+		elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
 	}
 }
 if ($friends && $owner) {
diff --git a/mod/file/pages/file/upload.php b/mod/file/pages/file/upload.php
index c19522530..d97cc038d 100644
--- a/mod/file/pages/file/upload.php
+++ b/mod/file/pages/file/upload.php
@@ -19,7 +19,7 @@ elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 if (elgg_instanceof($owner, 'user')) {
 	elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 } else {
-	elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+	elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
 }
 elgg_push_breadcrumb($title);
 
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 1d7c27337..daa2a400e 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -13,7 +13,7 @@ elgg_push_breadcrumb(elgg_echo('file'), 'file/all');
 
 $crumbs_title = $owner->name;
 if (elgg_instanceof($owner, 'group')) {
-	elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/owner");
+	elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/all");
 } else {
 	elgg_push_breadcrumb($crumbs_title, "file/owner/$owner->username");
 }
diff --git a/mod/file/start.php b/mod/file/start.php
index d4f12e903..b94dc309a 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -73,7 +73,7 @@ function file_init() {
  *  View file:       file/view/<guid>/<title>
  *  New file:        file/add/<guid>
  *  Edit file:       file/edit/<guid>
- *  Group files:     file/group/<guid>/owner
+ *  Group files:     file/group/<guid>/all
  *
  * Title is ignored
  *
@@ -152,7 +152,7 @@ function file_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->file_enable != "no") {
-			$url = "file/group/{$params['entity']->guid}/owner";
+			$url = "file/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('file', elgg_echo('file:group'), $url);
 			$return[] = $item;
 		}
diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index de8c62098..830b1096c 100644
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -10,7 +10,7 @@ if ($group->file_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "file/group/$group->guid/owner",
+	'href' => "file/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
-- 
cgit v1.2.3