aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-12-13 03:57:43 +0100
committerSem <sembrestels@riseup.net>2012-12-13 03:57:43 +0100
commit0ee05b2865942bad4cef7a1b038ad40fbdd602e1 (patch)
treeb131b8063fe8fd295669cd0320e8f24ffcc64c0d
parent239c21dbb324f65e589647ec01b9e5cd98bf2c80 (diff)
parent22a0edfb63d91074136067a163ee7cf7363b269f (diff)
downloadelgg-0ee05b2865942bad4cef7a1b038ad40fbdd602e1.tar.gz
elgg-0ee05b2865942bad4cef7a1b038ad40fbdd602e1.tar.bz2
Merge branch 'file-urls' of github.com:sembrestels/Elgg into foxglove-1
-rw-r--r--mod/file/start.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/file/start.php b/mod/file/start.php
index cc777d260..846ce1839 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -121,8 +121,12 @@ function file_page_handler($page) {
file_register_toggle();
include "$file_dir/friends.php";
break;
- case 'view':
case 'read': // Elgg 1.7 compatibility
+ $entity = get_entity((int) $page[1]);
+ if ($entity) {
+ elgg_set_page_owner_guid($entity->getContainerGUID());
+ }
+ case 'view':
set_input('guid', $page[1]);
include "$file_dir/view.php";
break;