Merged from stable

diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php
index f1c14a11391f347a173cc50231d1ebdc647dadba..f17c47b1c0b5c98d527270b788e492f38c604625 100644 (file)
--- a/mod/resource/type/directory/resource.class.php
+++ b/mod/resource/type/directory/resource.class.php
@@ -37,7 +37,7 @@ function display() {
     }
 
     if ($subdir) {
-        if (detect_munged_arguments($subdir)) {
+        if (detect_munged_arguments($subdir, 0)) {
             error("The value for 'subdir' contains illegal characters!");
         }
         $relativepath = "$relativepath$subdir";