Merge pull request Elgg#5962 from juho-jaakkola/file_icon_link

Do not use link with file icon when using full_view
andreaLbc · Aug 28, 2013 · 335db5e · 335db5e
2 parents 05af220 + 785c2db
commit 335db5e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
@@ -26,8 +26,6 @@
 ));
 $author_text = elgg_echo('byline', array($owner_link));
 
-$file_icon = elgg_view_entity_icon($file, 'small');
-
 $date = elgg_view_friendly_time($file->time_created);
 
 $comments_count = $file->countComments();
@@ -78,6 +76,8 @@
 	$text = elgg_view('output/longtext', array('value' => $file->description));
 	$body = "$text $extra";
 
+	$file_icon = elgg_view_entity_icon($file, 'small', array('href' => false));
+
 	echo elgg_view('object/elements/full', array(
 		'entity' => $file,
 		'icon' => $file_icon,
@@ -94,6 +94,8 @@
 } else {
 	// brief view
 
+	$file_icon = elgg_view_entity_icon($file, 'small');
+
 	$params = array(
 		'entity' => $file,
 		'metadata' => $metadata,