From 47b86299bbb172d3f55fef98dc7ba1c8d5e07414 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 15:05:24 +0000 Subject: Fixes #3523 setting public write access to logged in for pages git-svn-id: http://code.elgg.org/elgg/trunk@9172 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/pages/views/default/object/page_top.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'mod/pages/views/default/object/page_top.php') diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php index 756c542b4..0ad377c7e 100644 --- a/mod/pages/views/default/object/page_top.php +++ b/mod/pages/views/default/object/page_top.php @@ -18,6 +18,13 @@ if (!$page) { return TRUE; } +// pages used to use Public for write access +if ($page->write_access_id == ACCESS_PUBLIC) { + // this works because this metadata is public + $page->write_access_id = ACCESS_LOGGED_IN; +} + + if ($revision) { $annotation = $revision; } else { -- cgit v1.2.3 From d720eac96fda5415f4becf64d6ba49716aa14f6c Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 15:25:34 +0000 Subject: Fixes #3096 added user and group summery views an updated plugins to use the new view locations git-svn-id: http://code.elgg.org/elgg/trunk@9174 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/object/blog.php | 4 ++-- mod/bookmarks/views/default/object/bookmarks.php | 4 ++-- mod/embed/views/default/embed/item/list.php | 2 +- mod/file/views/default/object/file.php | 4 ++-- mod/groups/views/default/group/default.php | 2 +- mod/groups/views/default/object/groupforumtopic.php | 4 ++-- mod/pages/views/default/object/page_top.php | 4 ++-- mod/thewire/views/default/object/thewire.php | 2 +- views/default/group/elements/summary.php | 13 +++++++++++++ views/default/object/default.php | 2 +- views/default/user/default.php | 2 +- views/default/user/elements/summary.php | 13 +++++++++++++ 12 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 views/default/group/elements/summary.php create mode 100644 views/default/user/elements/summary.php (limited to 'mod/pages/views/default/object/page_top.php') diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 048a68a1a..8456829fe 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -74,7 +74,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $blog_info = elgg_view_image_block($owner_icon, $list_body); @@ -94,7 +94,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($owner_icon, $list_body); } diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index ab00e23c6..38b0a721a 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -65,7 +65,7 @@ if ($full && !elgg_in_context('gallery')) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $bookmark_info = elgg_view_image_block($owner_icon, $list_body); $bookmark_icon = elgg_view_icon('push-pin-alt'); @@ -119,6 +119,6 @@ HTML; 'content' => $content, ); - $body = elgg_view('page/components/summary', $params); + $body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($owner_icon, $body); } \ No newline at end of file diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php index 232f0558b..89a2ffb63 100644 --- a/mod/embed/views/default/embed/item/list.php +++ b/mod/embed/views/default/embed/item/list.php @@ -54,7 +54,7 @@ $params = array( 'subtitle' => $subtitle, 'tags' => FALSE, ); -$list_body = elgg_view('page/components/summary', $params); +$list_body = elgg_view('object/elements/summary', $params); // @todo JS 1.8: is this approach better than inline js? echo "
getGUID()}\">" . elgg_view_image_block($item_icon, $list_body) . '
'; diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index 0b58ca76f..93a21c8e6 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -82,7 +82,7 @@ if ($full && !elgg_in_context('gallery')) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $file_info = elgg_view_image_block($file_icon, $list_body); @@ -112,7 +112,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($file_icon, $list_body); } diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php index 1f1035a38..2aa377813 100644 --- a/mod/groups/views/default/group/default.php +++ b/mod/groups/views/default/group/default.php @@ -31,7 +31,7 @@ if ($vars['full_view']) { 'metadata' => $metadata, 'subtitle' => $group->briefdescription, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('group/elements/summary', $params); echo elgg_view_image_block($icon, $list_body); } diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 9589d1fb8..3a4decbe4 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -67,7 +67,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $info = elgg_view_image_block($poster_icon, $list_body); @@ -90,7 +90,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($poster_icon, $list_body); } diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php index 0ad377c7e..2ad44e38c 100644 --- a/mod/pages/views/default/object/page_top.php +++ b/mod/pages/views/default/object/page_top.php @@ -82,7 +82,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $info = elgg_view_image_block($page_icon, $list_body); @@ -103,7 +103,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($page_icon, $list_body); } diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index 7beb197ee..3ae347711 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -51,7 +51,7 @@ $params = array( 'content' => thewire_filter($post->description), 'tags' => false, ); -$list_body = elgg_view('page/components/summary', $params); +$list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($owner_icon, $list_body); diff --git a/views/default/group/elements/summary.php b/views/default/group/elements/summary.php new file mode 100644 index 000000000..395ed5292 --- /dev/null +++ b/views/default/group/elements/summary.php @@ -0,0 +1,13 @@ + $subtitle, 'tags' => $vars['entity']->tags, ); -$body = elgg_view('page/components/summary', $params); +$body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($icon, $body); diff --git a/views/default/user/default.php b/views/default/user/default.php index 501949306..c0c18f85f 100644 --- a/views/default/user/default.php +++ b/views/default/user/default.php @@ -51,7 +51,7 @@ if (elgg_get_context() == 'gallery') { ); } - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('user/elements/summary', $params); echo elgg_view_image_block($icon, $list_body); } diff --git a/views/default/user/elements/summary.php b/views/default/user/elements/summary.php new file mode 100644 index 000000000..46d11c14c --- /dev/null +++ b/views/default/user/elements/summary.php @@ -0,0 +1,13 @@ +