Merge branch 'MDL-64181-35-fix' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE

2018-11-27 14:49:22 +08:00
parent 96c3b2042e aad94d9332
commit 2e36915e1f
2 changed files with 2 additions and 2 deletions
@@ -669,7 +669,7 @@ define([
        // This promise will not be resolved until all child partials are also resolved and ready.
        // We create it here to allow us to check for recursive inclusion of templates.
        // Keep track of the requested partials in this chain.
-        parentage = parentage || [];
+        parentage = parentage || [searchKey];

        cachePartialPromises[searchKey] = $.Deferred();