2 files changed, 5 insertions, 26 deletions
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 08cfdc550..6b68b4d68 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -6,6 +6,10 @@
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
  */
 
+elgg_load_css('lightbox');
+elgg_load_js('lightbox');
+elgg_load_js('tidypics');
+
 $subject = $vars['item']->getSubjectEntity();
 $subject_link = elgg_view('output/url', array(
 	'href' => $subject->getURL(),
@@ -21,6 +25,7 @@ $image_link = elgg_view('output/url', array(
 	'href' => $image->getURL(),
 	'text' => $image->getTitle(),
 	'is_trusted' => true,
+	'class' => 'elgg-lightbox-photo',
 ));
 
 $album_link = elgg_view('output/url', array(
diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php
deleted file mode 100644
index 7e6f0313d..000000000
--- a/views/default/river/object/image/tag.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$tagger = get_entity($vars['item']->subject_guid);
-$tagged = get_entity($vars['item']->object_guid);
-$annotation = get_annotation($vars['item']->annotation_id);
-if ($annotation) {
-	$image = get_entity($annotation->entity_guid);
-
-	// viewer may not have permission to view image
-	if (!$image) {
-		return;
-	}
-
-	$image_title = $image->getTitle();
-}
-
-$tagger_link = "<a href=\"{$tagger->getURL()}\">$tagger->name</a>";
-$tagged_link = "<a href=\"{$tagged->getURL()}\">$tagged->name</a>";
-if (!empty($image_title)) {
-	$image_link = "<a href=\"{$image->getURL()}\">$image_title</a>";
-	$string = sprintf(elgg_echo('image:river:tagged'), $tagger_link, $tagged_link, $image_link);
-} else {
-	$string = sprintf(elgg_echo('image:river:tagged:unknown'), $tagger_link, $tagged_link);	
-}
-
-echo $string;