Bug #6225 - Moodle bug #4658 Breaks assignment type: Upload Single; merged from MOODL...

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 6d3e4e08316a04372128d2bc2083506d7c0ed98d..bb8676788748147da08e8a7e9643f0d15d8718d7 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1494,7 +1494,7 @@ class assignment_base {
 
         $filearea = $this->file_area_name($userid);
 
-        if ( is_dir($filearea) && $basedir = $this->file_area($userid)) {
+        if ( is_dir($CFG->dataroot.'/'.$filearea) && $basedir = $this->file_area($userid)) {
             if ($files = get_directory_list($basedir)) {
                 return count($files);
             }