Merge branch 'wip-MDL-47583-m27' of git://github.com/marinaglancy/moo…

…dle into MOODLE_27_STABLE
moodle · Oct 15, 2014 · f6b9c0f · f6b9c0f
2 parents 450e3f2 + a881280
commit f6b9c0f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...es/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-debug.js b/...es/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-debug.js
@@ -155,7 +155,7 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
             usedFiles = {};
 
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
-            filename = unescape(match[1]);
+            filename = decodeURI(match[1]);
             usedFiles[filename] = true;
         }
 

diff --git a/...iles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-min.js b/...iles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-min.js
diff --git a/...agefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles.js b/...agefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles.js
@@ -154,7 +154,7 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
             usedFiles = {};
 
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
-            filename = unescape(match[1]);
+            filename = decodeURI(match[1]);
             usedFiles[filename] = true;
         }
 

diff --git a/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js b/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js
@@ -153,7 +153,7 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
             usedFiles = {};
 
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
-            filename = unescape(match[1]);
+            filename = decodeURI(match[1]);
             usedFiles[filename] = true;
         }
 

diff --git a/lib/editor/tinymce/plugins/managefiles/tinymce/editor_plugin.js b/lib/editor/tinymce/plugins/managefiles/tinymce/editor_plugin.js
@@ -83,7 +83,7 @@
                     patt = new RegExp(base.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
                     arr = [], match, filename;
                 while ((match = patt.exec(text)) !== null) {
-                    filename = unescape(match[1]);
+                    filename = decodeURI(match[1]);
                     if (arr.indexOf(filename) === -1) {
                         arr[arr.length] = filename;
                     }