Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle

2012-06-06 08:51:11 +12:00
parent 5deaa764ba 80c27aab8c
commit 7df271d9b3
6 changed files with 26 additions and 8 deletions
@@ -946,7 +946,10 @@ EOD;
            if ($result) {
                // recurse directories
                if (is_dir($localpath)) {
-                    $dp = opendir($localpath);
+                    if (!$dp = opendir($localpath)) {
+                        $this->_error_log("Could not open localpath for reading");
+                        return false;
+                    }
                    $fl = array();
                    while($filename = readdir($dp)) {
                        if ((is_file($localpath."/".$filename) || is_dir($localpath."/".$filename)) && $filename!="." && $filename != "..") {