diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-29 04:13:33 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:13:33 +0200 |
| commit | 7a9177c9df49d6fc02280df02d6e7f6d52531382 (patch) | |
| tree | 518ecb9df491374faa1062fee2d32dca61ba74a3 /pages | |
| parent | f9e9c6cb5950ccf1d1d5396caa9dbb2803aacdad (diff) | |
| parent | 24ff6662195222479b4d83d41fa89edc8a3c05d1 (diff) | |
| download | elgg-7a9177c9df49d6fc02280df02d6e7f6d52531382.tar.gz elgg-7a9177c9df49d6fc02280df02d6e7f6d52531382.tar.bz2 | |
Merge branch 'no-flash-uploader' of git://github.com/sembrestels/Tidypics
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/photos/image/upload.php | 10 |
1 files changed, 1 insertions, 9 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, |