aboutsummaryrefslogtreecommitdiff
path: root/pages/photos/image
diff options
context:
space:
mode:
Diffstat (limited to 'pages/photos/image')
-rw-r--r--pages/photos/image/upload.php10
-rw-r--r--pages/photos/image/view.php5
2 files changed, 1 insertions, 14 deletions
diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php
index 425d5689a..61be8523b 100644
--- a/pages/photos/image/upload.php
+++ b/pages/photos/image/upload.php
@@ -38,15 +38,7 @@ elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
elgg_push_breadcrumb($album->getTitle(), $album->getURL());
elgg_push_breadcrumb(elgg_echo('album:addpix'));
-$uploader = get_input('uploader');
-if ($uploader == 'basic') {
- $content = elgg_view('forms/photos/basic_upload', array('entity' => $album));
-} else {
- elgg_load_js('swfobject');
- elgg_load_js('jquery.uploadify-tp');
- elgg_load_js('tidypics:uploading');
- $content = elgg_view('forms/photos/ajax_upload', array('entity' => $album));
-}
+$content = elgg_view('forms/photos/basic_upload', array('entity' => $album));
$body = elgg_view_layout('content', array(
'content' => $content,
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) {