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/photos/tagging/select.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/photos/tagging/select.php')
-rw-r--r-- | views/default/photos/tagging/select.php | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/views/default/photos/tagging/select.php b/views/default/photos/tagging/select.php deleted file mode 100644 index 8894af63a..000000000 --- a/views/default/photos/tagging/select.php +++ /dev/null @@ -1,16 +0,0 @@ -<?php -/** - * Tag select view - * - * @uses $vars['entity'] - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$body = elgg_view_form('photos/image/tag', array(), $vars); - -echo elgg_view_module('popup', elgg_echo('tidypics:tagthisphoto'), $body, array( - 'class' => 'tidypics-tagging-select pam hidden', - 'id' => 'tidypics-tagging-select', -)); |