From: Sem <sembrestels@riseup.net>
Date: Fri, 3 Aug 2012 21:35:38 +0000 (+0200)
Subject: Drop files from desktop disabled (wasn't working).
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a5f23d31518e5b8f00293fde8bc2fbdd481d574b;p=lorea%2Felgg.git

Drop files from desktop disabled (wasn't working).
---

diff --git a/views/default/js/photos/upload.php b/views/default/js/photos/upload.php
index 05421125d..82e2696bd 100644
--- a/views/default/js/photos/upload.php
+++ b/views/default/js/photos/upload.php
@@ -3,6 +3,9 @@
  *
  */
 
+$maxfilesize = (int) elgg_get_plugin_setting('maxfilesize', 'tidypics');
+$maxfilesize *= 1024;
+
 ?>
 
 elgg.provide('elgg.tidypics.upload');
@@ -41,12 +44,15 @@ elgg.tidypics.upload.init = function() {
 
 	// Settings
 	$('#fileupload').fileupload('option', {
-		maxFileSize: 5000000,
+		maxFileSize: <?php echo $maxfilesize; ?>,
 		acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
 		change: function() {
 			elgg.tidypics.upload.fileinput.hide().appendTo($('#fileupload'));
 			elgg.tidypics.upload.fileinput = $('#fileupload .elgg-input-file');
 		},
+		drop: function () {
+			return false;
+		}
 	});
 	
 	elgg.tidypics.upload.fileinput = $('#fileupload .elgg-input-file');