MDL-16706 fix of previous fix - multiple editors in one form shoudl work again

diff --git a/lib/form/editor.php b/lib/form/editor.php
index eaf92b95d6be3b56d6717cbac7e9dc4b70563636..0f47db13f446bdda13c3d25eaffcd9625a8dde56 100644 (file)
--- a/lib/form/editor.php
+++ b/lib/form/editor.php
@@ -179,11 +179,11 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
             $repojs = repository_get_client($ctx, $client_id, array('image', 'video', 'media'), '*');
 
             $str .= $repojs;
-            $str .= $PAGE->requires->data_for_js('id2clientid', Array($id=>$client_id))->asap();
-            $str .= $PAGE->requires->data_for_js('id2itemid', Array($id=>$draftitemid))->asap();
+            $str .= $PAGE->requires->js_function_call('id2_add_clientid', array($id, $client_id))->asap();
+            $str .= $PAGE->requires->js_function_call('id2_add_itemid', array($id, $draftitemid))->asap();
 
             if ($editor->supports_repositories()) {
-                $str .= $PAGE->requires->js_function_call('hide_item', Array("{$id}_filemanager"))->asap();
+                $str .= $PAGE->requires->js_function_call('hide_item', array("{$id}_filemanager"))->asap();
             }
         }
 

diff --git a/repository/repository.src.js b/repository/repository.src.js
index b4e2b211fb53b3c18217dcbb0290bba9e4f3a320..cdd46fc7b0c3d3a6e10f78f84cad905dc344c4af 100644 (file)
--- a/repository/repository.src.js
+++ b/repository/repository.src.js
@@ -1239,3 +1239,11 @@ function open_filepicker(id, params) {
     r.maxfiles = params.maxfiles;
     return r;
 }
+
+function id2_add_clientid(id, clientid) {
+       id2clientid[id] = clientid;
+}
+
+var id2_add_itemid(id, drafitemid) {
+       id2itemid[id] = drafitemid;
+}