aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2012-01-02 21:29:57 -0500
committercash <cash.costello@gmail.com>2012-01-02 21:29:57 -0500
commitd24d480f6510b3817f3e85699714ca6ed7ab234c (patch)
tree89ad9d47a22f09f802f85b63f78c10497ef2fcd4 /pages
parent83cbd76b2e11b7d832e212ce1ffc77da7a3dd2a6 (diff)
downloadelgg-d24d480f6510b3817f3e85699714ca6ed7ab234c.tar.gz
elgg-d24d480f6510b3817f3e85699714ca6ed7ab234c.tar.bz2
added uploading scripts
Diffstat (limited to 'pages')
-rw-r--r--pages/photos/image/upload.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php
index 7d9db5ed8..0c327d53e 100644
--- a/pages/photos/image/upload.php
+++ b/pages/photos/image/upload.php
@@ -14,7 +14,7 @@ if (!$album_guid) {
forward();
}
-if (elgg_get_plugin_setting('uploader', 'tidypics') != "disabled") {
+if (elgg_get_plugin_setting('uploader', 'tidypics')) {
$uploader = get_input('uploader', 'ajax');
} else {
$uploader = 'basic';
@@ -48,6 +48,9 @@ elgg_push_breadcrumb(elgg_echo('album:addpix'));
if ($uploader == 'basic') {
$content = elgg_view('forms/photos/basic_upload', array('entity' => $album));
} else {
+ elgg_load_js('swfobject');
+ elgg_load_js('jquery.uploadify');
+ elgg_load_js('tidypics:uploading');
$content = elgg_view('forms/photos/ajax_upload', array('entity' => $album));
}