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

This commit is contained in:
Sam Hemelryk 2012-06-06 08:51:11 +12:00
commit 7df271d9b3
6 changed files with 26 additions and 8 deletions

View file

@ -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 != "..") {