L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-27915' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-06-20 12:39:19 +02:00
parent ee37607188 d610cb8980
commit 6f9297b48b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filestorage/file_storage.php
+2 -2
View File
@@ -1045,7 +1045,7 @@ class file_storage {
*/
public function add_file_to_pool($pathname, $contenthash = NULL) {
if (!is_readable($pathname)) {
throw new file_exception('storedfilecannotread');
throw new file_exception('storedfilecannotread', '', $pathname);
}
if (is_null($contenthash)) {
@@ -1072,7 +1072,7 @@ class file_storage {
$newfile = true;
if (!copy($pathname, $hashfile)) {
throw new file_exception('storedfilecannotread');
throw new file_exception('storedfilecannotread', '', $pathname);
}
if (filesize($hashfile) !== $filesize) {
lib/filestorage/stored_file.php
+4 -4
View File
@@ -125,7 +125,7 @@ class stored_file {
$path = $this->get_content_file_location();
if (!is_readable($path)) {
if (!$this->fs->try_content_recovery($this) or !is_readable($path)) {
throw new file_exception('storedfilecannotread');
throw new file_exception('storedfilecannotread', '', $path);
}
}
return fopen($path, 'rb'); //binary reading only!!
@@ -140,7 +140,7 @@ class stored_file {
$path = $this->get_content_file_location();
if (!is_readable($path)) {
if (!$this->fs->try_content_recovery($this) or !is_readable($path)) {
throw new file_exception('storedfilecannotread');
throw new file_exception('storedfilecannotread', '', $path);
}
}
readfile($path);
@@ -155,7 +155,7 @@ class stored_file {
$path = $this->get_content_file_location();
if (!is_readable($path)) {
if (!$this->fs->try_content_recovery($this) or !is_readable($path)) {
throw new file_exception('storedfilecannotread');
throw new file_exception('storedfilecannotread', '', $path);
}
}
return file_get_contents($this->get_content_file_location());
@@ -171,7 +171,7 @@ class stored_file {
$path = $this->get_content_file_location();
if (!is_readable($path)) {
if (!$this->fs->try_content_recovery($this) or !is_readable($path)) {
throw new file_exception('storedfilecannotread');
throw new file_exception('storedfilecannotread', '', $path);
}
}
return copy($path, $pathname);