Merge branch 'MDL-73121' of https://github.com/paulholden/moodle

UniGe · Jun 28, 2022 · 34d5589 · 34d5589
2 parents 6dbfb3b + 47f9106
commit 34d5589
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 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
@@ -151,11 +151,12 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
     _getUsedFiles: function() {
         var content = Y.one(window.parent.document.getElementById(this._elementid + 'editable')),
             baseUrl = M.cfg.wwwroot + '/draftfile.php/' + this._usercontext + '/user/draft/' + this._itemid + '/',
-            pattern = new RegExp(baseUrl.replace(/[\-\/\\\^$*+?.()|\[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
+            pattern = new RegExp("[\"']" + baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
             filename = '',
             match = '',
             usedFiles = {};
 
+        // The pattern matches any draftfile URL contained within quotes, e.g. 'src="<filename>"' or 'href="<filename>"'.
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
             filename = decodeURIComponent(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
@@ -150,11 +150,12 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
     _getUsedFiles: function() {
         var content = Y.one(window.parent.document.getElementById(this._elementid + 'editable')),
             baseUrl = M.cfg.wwwroot + '/draftfile.php/' + this._usercontext + '/user/draft/' + this._itemid + '/',
-            pattern = new RegExp(baseUrl.replace(/[\-\/\\\^$*+?.()|\[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
+            pattern = new RegExp("[\"']" + baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
             filename = '',
             match = '',
             usedFiles = {};
 
+        // The pattern matches any draftfile URL contained within quotes, e.g. 'src="<filename>"' or 'href="<filename>"'.
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
             filename = decodeURIComponent(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
@@ -149,11 +149,12 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
     _getUsedFiles: function() {
         var content = Y.one(window.parent.document.getElementById(this._elementid + 'editable')),
             baseUrl = M.cfg.wwwroot + '/draftfile.php/' + this._usercontext + '/user/draft/' + this._itemid + '/',
-            pattern = new RegExp(baseUrl.replace(/[\-\/\\\^$*+?.()|\[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
+            pattern = new RegExp("[\"']" + baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
             filename = '',
             match = '',
             usedFiles = {};
 
+        // The pattern matches any draftfile URL contained within quotes, e.g. 'src="<filename>"' or 'href="<filename>"'.
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
             filename = decodeURIComponent(match[1]);
             usedFiles[filename] = true;