From 5cc8de829c0a7b86c8df27293f4825d0e340d592 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Fri, 16 Mar 2012 22:51:12 -0700
Subject: Fixes #14. Fixed uploadify.

---
 pages/photos/image/upload.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'pages/photos/image')

diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php
index 0c327d53e..395651ca9 100644
--- a/pages/photos/image/upload.php
+++ b/pages/photos/image/upload.php
@@ -14,12 +14,6 @@ if (!$album_guid) {
 	forward();
 }
 
-if (elgg_get_plugin_setting('uploader', 'tidypics')) {
-	$uploader = get_input('uploader', 'ajax');
-} else {
-	$uploader = 'basic';
-}
-
 $album = get_entity($album_guid);
 if (!$album) {
 	// @todo
@@ -44,7 +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 {
-- 
cgit v1.2.3