diff options
| author | Sem <sembrestels@riseup.net> | 2013-02-13 01:25:07 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-02-13 01:25:07 +0100 |
| commit | 5aff5b3913fbb6226d8fb3162453c58888fba38d (patch) | |
| tree | 2bf8fe649d8c9d09a3be03154c4c669bccfbc54c /mod/file | |
| parent | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (diff) | |
| parent | 8d3a7ab1755829c6e070a038d6b33e326de8fc8f (diff) | |
| download | elgg-5aff5b3913fbb6226d8fb3162453c58888fba38d.tar.gz elgg-5aff5b3913fbb6226d8fb3162453c58888fba38d.tar.bz2 | |
Merge tag '1.8.13' of git://github.com/Elgg/Elgg
Elgg 1.8.13 release
Diffstat (limited to 'mod/file')
| -rw-r--r-- | mod/file/start.php | 5 | ||||
| -rw-r--r-- | mod/file/views/default/object/file.php | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mod/file/start.php b/mod/file/start.php index cc777d260..7c0c216b2 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -121,8 +121,11 @@ function file_page_handler($page) { file_register_toggle(); include "$file_dir/friends.php"; break; - case 'view': case 'read': // Elgg 1.7 compatibility + register_error(elgg_echo("changebookmark")); + forward("file/view/{$page[1]}"); + break; + case 'view': set_input('guid', $page[1]); include "$file_dir/view.php"; break; diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index b3f530183..64f19c483 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -68,6 +68,7 @@ if ($full && !elgg_in_context('gallery')) { $params = array( 'entity' => $file, + 'title' => false, 'metadata' => $metadata, 'subtitle' => $subtitle, ); @@ -79,7 +80,6 @@ if ($full && !elgg_in_context('gallery')) { echo elgg_view('object/elements/full', array( 'entity' => $file, - 'title' => false, 'icon' => $file_icon, 'summary' => $summary, 'body' => $body, |