diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-06-03 01:40:06 +0000 | 
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-06-03 01:40:06 +0000 | 
| commit | e8da61b8e8654caa45a5315ce338886e802f044d (patch) | |
| tree | 0088c353bd748943036f29e0df9139decb6af29e | |
| parent | 33f7cec924ff46d5f890130393fe023d2ddd6100 (diff) | |
| download | elgg-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
24 files changed, 29 insertions, 29 deletions
diff --git a/mod/blog/actions/blog/delete.php b/mod/blog/actions/blog/delete.php index 6028480ff..ca4eb8a7f 100644 --- a/mod/blog/actions/blog/delete.php +++ b/mod/blog/actions/blog/delete.php @@ -13,7 +13,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {  	if ($blog->delete()) {  		system_message(elgg_echo('blog:message:deleted_post'));  		if (elgg_instanceof($container, 'group')) { -			forward("blog/group/$container->guid/owner"); +			forward("blog/group/$container->guid/all");  		} else {  			forward("blog/owner/$container->username");  		} diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index 2c53c0f0f..8964d5b53 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -32,7 +32,7 @@ function blog_get_page_content_read($guid = NULL) {  	$container = $blog->getContainerEntity();  	$crumbs_title = $container->name;  	if (elgg_instanceof($container, 'group')) { -		elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/owner"); +		elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/all");  	} else {  		elgg_push_breadcrumb($crumbs_title, "blog/owner/$container->username");  	} @@ -396,7 +396,7 @@ function blog_url_forwarder($page) {  		$guid = $matches[1];  		$entity = get_entity($guid);  		if ($entity) { -			$url = "{$CONFIG->wwwroot}blog/group/$guid/owner"; +			$url = "{$CONFIG->wwwroot}blog/group/$guid/all";  			register_error(elgg_echo("changebookmark"));  			forward($url);  		} diff --git a/mod/blog/start.php b/mod/blog/start.php index 33c6ee20d..b9911aa74 100644 --- a/mod/blog/start.php +++ b/mod/blog/start.php @@ -85,7 +85,7 @@ function blog_init() {   *  New post:        blog/add/<guid>   *  Edit post:       blog/edit/<guid>/<revision>   *  Preview post:    blog/preview/<guid> - *  Group blog:      blog/group/<guid>/owner + *  Group blog:      blog/group/<guid>/all   *   * Title is ignored   * @@ -178,7 +178,7 @@ function blog_owner_block_menu($hook, $type, $return, $params) {  		$return[] = $item;  	} else {  		if ($params['entity']->blog_enable != "no") { -			$url = "blog/group/{$params['entity']->guid}/owner"; +			$url = "blog/group/{$params['entity']->guid}/all";  			$item = new ElggMenuItem('blog', elgg_echo('blog:group'), $url);  			$return[] = $item;  		} diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php index 9a1515585..6cfe6c98e 100644 --- a/mod/blog/views/default/blog/group_module.php +++ b/mod/blog/views/default/blog/group_module.php @@ -10,7 +10,7 @@ if ($group->blog_enable == "no") {  }  $all_link = elgg_view('output/url', array( -	'href' => "blog/group/$group->guid/owner", +	'href' => "blog/group/$group->guid/all",  	'text' => elgg_echo('link:view:all'),  )); 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'),  )); 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'),  )); diff --git a/mod/messageboard/pages/messageboard/owner.php b/mod/messageboard/pages/messageboard/owner.php index 7fd88a9d4..58021c29e 100644 --- a/mod/messageboard/pages/messageboard/owner.php +++ b/mod/messageboard/pages/messageboard/owner.php @@ -24,7 +24,7 @@ if ($history_user) {  	$title = elgg_echo('messageboard:owner_history', array($history_user->name, $page_owner->name));  	if ($page_owner instanceof ElggGroup) { -		$mb_url = "messageboard/group/$page_owner->guid/owner"; +		$mb_url = "messageboard/group/$page_owner->guid/all";  	} else {  		$mb_url = "messageboard/owner/$page_owner->username";  	} diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php index 899df19c3..efe453286 100644 --- a/mod/messageboard/start.php +++ b/mod/messageboard/start.php @@ -36,7 +36,7 @@ function messageboard_init() {   *  User's messageboard:               messageboard/owner/<username>   *  Y's history of posts on X's board: messageboard/owner/<X>/history/<Y>   *  New post:                          messageboard/add/<guid> (container: user or group) - *  Group messageboard:                messageboard/group/<guid>/owner + *  Group messageboard:                messageboard/group/<guid>/all (not implemented)   *   * @param array $page Array of page elements   * @return bool diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php index 55b12f29b..63f389e6a 100644 --- a/mod/messageboard/views/default/widgets/messageboard/content.php +++ b/mod/messageboard/views/default/widgets/messageboard/content.php @@ -23,7 +23,7 @@ $options = array(  echo elgg_list_annotations($options);  if ($owner instanceof ElggGroup) { -	$url = "messageboard/group/$owner->guid/owner"; +	$url = "messageboard/group/$owner->guid/all";  } else {  	$url = "messageboard/owner/$owner->username";  } diff --git a/mod/pages/actions/pages/delete.php b/mod/pages/actions/pages/delete.php index 077561b1e..dfa0de98d 100644 --- a/mod/pages/actions/pages/delete.php +++ b/mod/pages/actions/pages/delete.php @@ -33,7 +33,7 @@ if ($page) {  				}  			}  			if (elgg_instanceof($container, 'group')) { -				forward("pages/group/$container->guid/owner"); +				forward("pages/group/$container->guid/all");  			} else {  				forward("pages/owner/$container->username");  			} diff --git a/mod/pages/pages/pages/history.php b/mod/pages/pages/pages/history.php index 7ed5ad7f7..a7ef57b6b 100644 --- a/mod/pages/pages/pages/history.php +++ b/mod/pages/pages/pages/history.php @@ -20,7 +20,7 @@ if (!$container) {  elgg_set_page_owner_guid($container->getGUID());  if (elgg_instanceof($container, 'group')) { -	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner"); +	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");  } else {  	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");  } diff --git a/mod/pages/pages/pages/revision.php b/mod/pages/pages/pages/revision.php index f542f5201..83d72286c 100644 --- a/mod/pages/pages/pages/revision.php +++ b/mod/pages/pages/pages/revision.php @@ -27,7 +27,7 @@ if (!$container) {  $title = $page->title . ": " . elgg_echo('pages:revision');  if (elgg_instanceof($container, 'group')) { -	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner"); +	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");  } else {  	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");  } diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php index d3503709d..b9f1fde83 100644 --- a/mod/pages/pages/pages/view.php +++ b/mod/pages/pages/pages/view.php @@ -22,7 +22,7 @@ if (!$container) {  $title = $page->title;  if (elgg_instanceof($container, 'group')) { -	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner"); +	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");  } else {  	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");  } diff --git a/mod/pages/start.php b/mod/pages/start.php index 772fa2de9..2e2bc1ed6 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -95,7 +95,7 @@ function pages_init() {   *  Edit page:        pages/edit/<guid>   *  History of page:  pages/history/<guid>   *  Revision of page: pages/revision/<id> - *  Group pages:      pages/group/<guid>/owner + *  Group pages:      pages/group/<guid>/all   *   * Title is ignored   * @@ -208,7 +208,7 @@ function pages_owner_block_menu($hook, $type, $return, $params) {  		$return[] = $item;  	} else {  		if ($params['entity']->pages_enable != "no") { -			$url = "pages/group/{$params['entity']->guid}/owner"; +			$url = "pages/group/{$params['entity']->guid}/all";  			$item = new ElggMenuItem('pages', elgg_echo('pages:group'), $url);  			$return[] = $item;  		} diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php index 6befb1c65..1d3437e18 100644 --- a/mod/pages/views/default/pages/group_module.php +++ b/mod/pages/views/default/pages/group_module.php @@ -13,7 +13,7 @@ if ($group->pages_enable == "no") {  }  $all_link = elgg_view('output/url', array( -	'href' => "pages/group/$group->guid/owner", +	'href' => "pages/group/$group->guid/all",  	'text' => elgg_echo('link:view:all'),  ));  | 
