"MDL-16597, passing maxbytes and maxfiles to file picker"

diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
index 23a8b8468ba6a33fc707cf5db3659b6cda91bd50..eef7bf044a56f15dc16f24a80acfebaab83ff8f2 100644 (file)
--- a/lib/form/filemanager.php
+++ b/lib/form/filemanager.php
@@ -206,12 +206,14 @@ function callpicker(el_id, client_id, itemid) {
     picker.className = 'file-picker';
     document.body.appendChild(picker);
     var el=document.getElementById(el_id);
-    var obj = {};
-    obj.env = 'filemanager';
-    obj.itemid = itemid;
-    obj.target = el;
-    obj.callback = fp_callback;
-    var fp = open_filepicker(client_id, obj);
+    var params = {};
+    params.env = 'filemanager';
+    params.maxbytes = $this->_options['maxbytes'];
+    params.maxfiles = $this->_options['maxfiles'];
+    params.itemid = itemid;
+    params.target = el;
+    params.callback = fp_callback;
+    var fp = open_filepicker(client_id, params);
 }
 //]]>
 </script>

diff --git a/lib/form/filepicker.php b/lib/form/filepicker.php
index 1ded21d1e97707e0e7be9ef92070f0e1a6e30ab9..167262f70ffb09a1492d0b3a715f8224f889c283 100644 (file)
--- a/lib/form/filepicker.php
+++ b/lib/form/filepicker.php
@@ -103,7 +103,13 @@ function callpicker(client_id, id) {
     picker.className = 'file-picker';
     document.body.appendChild(picker);
     var el=document.getElementById(id);
-    open_filepicker({'env':'filepicker', 'target':el, 'callback':updatefile})
+    var params = {};
+    params.env = 'filepicker';
+    params.maxbytes = $this->_options['maxbytes'];
+    params.maxfiles = $this->_options['maxfiles'];
+    params.target = el;
+    params.callback = updatefile;
+    open_filepicker(client_id, params);
 }
 </script>
 EOD;