aboutsummaryrefslogtreecommitdiff
path: root/pages/photos/image
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-07-13 22:50:23 -0400
committerCash Costello <cash.costello@gmail.com>2012-07-13 22:50:23 -0400
commit01730a85bced88f32d88efac995ea12294934a63 (patch)
tree62b71d96d02fce3a75393da08219714fdad4789d /pages/photos/image
parent919ae814fa2b651072b5bbb901e2183220a0dd30 (diff)
parent5cc8de829c0a7b86c8df27293f4825d0e340d592 (diff)
downloadelgg-01730a85bced88f32d88efac995ea12294934a63.tar.gz
elgg-01730a85bced88f32d88efac995ea12294934a63.tar.bz2
flash uploader working
Diffstat (limited to 'pages/photos/image')
-rw-r--r--pages/photos/image/upload.php8
1 files changed, 1 insertions, 7 deletions
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 {