aboutsummaryrefslogtreecommitdiff
path: root/pages/photos
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-29 04:19:50 +0200
committerSem <sembrestels@riseup.net>2012-07-29 04:19:50 +0200
commit55bb2b7ed2583683548e314ae13fadde61eb04d6 (patch)
tree18aa780112c293ef078b7651a0c7f08ffd6b13da /pages/photos
parent7a9177c9df49d6fc02280df02d6e7f6d52531382 (diff)
parent12a88208acec40e190b0729887e28c9d9add26c3 (diff)
downloadelgg-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 'pages/photos')
-rw-r--r--pages/photos/image/view.php5
1 files changed, 0 insertions, 5 deletions
diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php
index fc4a01320..e30bed70a 100644
--- a/pages/photos/image/view.php
+++ b/pages/photos/image/view.php
@@ -19,11 +19,6 @@ if (!$photo) {
$photo->addView();
-if (elgg_get_plugin_setting('tagging', 'tidypics')) {
- elgg_load_js('tidypics:tagging');
- elgg_load_js('jquery.imgareaselect');
-}
-
// set page owner based on owner of photo album
$album = $photo->getContainerEntity();
if ($album) {