aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-07-10 12:57:56 +0000
committerCash Costello <cash.costello@gmail.com>2011-07-10 12:57:56 +0000
commitd94bfb36201438a48cbe2c521e28e18232682a51 (patch)
treeefa6b3d3d80fb94d933c88596174fad4bb4d4d5f /pages
parente6f2aab29afb89bc07ff8bd867a9c69f85f1eb21 (diff)
downloadelgg-d94bfb36201438a48cbe2c521e28e18232682a51.tar.gz
elgg-d94bfb36201438a48cbe2c521e28e18232682a51.tar.bz2
admins can turn off flash uploader
Diffstat (limited to 'pages')
-rw-r--r--pages/upload.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/pages/upload.php b/pages/upload.php
index b6a828cf9..7ac4930b5 100644
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -14,7 +14,12 @@ if (!$album_guid) {
forward();
}
-$uploader = get_input('uploader', 'ajax');
+if (get_plugin_setting('uploader', 'tidypics') != "disabled") {
+ $uploader = get_input('uploader', 'ajax');
+} else {
+ $uploader = 'basic';
+}
+
$album = get_entity($album_guid);