From 1de6813123ae865e4420b341ade372feaaf7bd25 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 19 Jan 2013 08:52:59 -0500
Subject: Fixes #4990 removes extra title for full file view

---
 mod/file/views/default/object/file.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/file')

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,
-- 
cgit v1.2.3


From b60f6e6b921c2d25867c23790130be9a0386c0a4 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 23 Jan 2013 07:16:15 -0500
Subject: better solution for 1.7 file compatibility than pull request 471

---
 mod/blog/start.php      | 5 ++++-
 mod/bookmarks/start.php | 5 ++++-
 mod/file/start.php      | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'mod/file')

diff --git a/mod/blog/start.php b/mod/blog/start.php
index 8cbaf5cca..eb6eee05f 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -124,9 +124,12 @@ function blog_page_handler($page) {
 			$params = blog_get_page_content_archive($user->guid, $page[2], $page[3]);
 			break;
 		case 'view':
-		case 'read': // Elgg 1.7 compatibility
 			$params = blog_get_page_content_read($page[1]);
 			break;
+		case 'read': // Elgg 1.7 compatibility
+			register_error(elgg_echo("changebookmark"));
+			forward("blog/view/{$page[1]}");
+			break;
 		case 'add':
 			gatekeeper();
 			$params = blog_get_page_content_edit($page_type, $page[1]);
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 66e22b565..3846f5165 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -125,11 +125,14 @@ function bookmarks_page_handler($page) {
 			include "$pages/friends.php";
 			break;
 
-		case "read":
 		case "view":
 			set_input('guid', $page[1]);
 			include "$pages/view.php";
 			break;
+		case 'read': // Elgg 1.7 compatibility
+			register_error(elgg_echo("changebookmark"));
+			forward("bookmarks/view/{$page[1]}");
+			break;
 
 		case "add":
 			gatekeeper();
diff --git a/mod/file/start.php b/mod/file/start.php
index 172042332..7ea050ce3 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;
-- 
cgit v1.2.3