Merge branch 'no-tagging-photos' of git://github.com/sembrestels/Tidypics

Conflicts:
	languages/de.php
	languages/en.php
	start.php
	views/default/forms/photos/admin/settings/main.php
	views/default/photos/css.php

1 files changed, 0 insertions, 20 deletions

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 2aa76d48f..fc8ea827e 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -175,26 +175,6 @@ if (get_context() == "search") {
 			<div class="clearfloat"></div>
 		</div>
 				<?php
-				// image menu (start tagging, download, etc.)
-
-				echo '<div id="tidypics_controls"><ul>';
-				echo elgg_view('tidypics/image_menu', array(
-					'image_guid' => $image_guid,
-					'viewer' => $viewer,
-					'owner' => $owner,
-					'anytags' => $image->isPhotoTagged(),
-					'album' => $album, ) );
-				echo '</ul></div>';
-
-				// tagging code - photo tags on images, photo tag listing and hidden divs used in tagging
-				if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
-					echo elgg_view('tidypics/tagging', array(
-						'image' => $image,
-						'viewer' => $viewer,
-						'owner' => $owner, ) );
-				}
-
-
 				if (get_plugin_setting('exif', 'tidypics') == "enabled") {
 					echo elgg_view('tidypics/exif', array('guid'=> $image_guid));
 				}