diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-29 04:19:50 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:19:50 +0200 |
| commit | 55bb2b7ed2583683548e314ae13fadde61eb04d6 (patch) | |
| tree | 18aa780112c293ef078b7651a0c7f08ffd6b13da /views/default/object/image/full.php | |
| parent | 7a9177c9df49d6fc02280df02d6e7f6d52531382 (diff) | |
| parent | 12a88208acec40e190b0729887e28c9d9add26c3 (diff) | |
| download | elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.gz elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.bz2 | |
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
Diffstat (limited to 'views/default/object/image/full.php')
| -rw-r--r-- | views/default/object/image/full.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index 175519c16..4e2c02a9a 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -51,10 +51,7 @@ echo $summary; echo '<div class="tidypics-photo-wrapper center">'; echo elgg_view('object/image/navigation', $vars); -echo elgg_view('photos/tagging/help', $vars); -echo elgg_view('photos/tagging/select', $vars); echo $img; -echo elgg_view('photos/tagging/tags', $vars); echo '</div>'; if ($photo->description) { |