mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
Merge branch 'MDL-80157_storedfileproblem' of https://github.com/leonstr/moodle
This commit is contained in:
commit
ae15c3de69
@ -1247,7 +1247,7 @@ class file_storage {
|
||||
$tmpfile = tempnam($this->tempdir, 'newfromurl');
|
||||
$content = download_file_content($url, $headers, $postdata, $fullresponse, $timeout, $connecttimeout, $skipcertverify, $tmpfile, $calctimeout);
|
||||
if ($content === false) {
|
||||
throw new file_exception('storedfileproblem', 'Can not fetch file form URL');
|
||||
throw new file_exception('storedfileproblem', 'Cannot fetch file from URL');
|
||||
}
|
||||
try {
|
||||
$newfile = $this->create_file_from_pathname($filerecord, $tmpfile);
|
||||
@ -1261,7 +1261,7 @@ class file_storage {
|
||||
} else {
|
||||
$content = download_file_content($url, $headers, $postdata, $fullresponse, $timeout, $connecttimeout, $skipcertverify, NULL, $calctimeout);
|
||||
if ($content === false) {
|
||||
throw new file_exception('storedfileproblem', 'Can not fetch file form URL');
|
||||
throw new file_exception('storedfileproblem', 'Cannot fetch file from URL');
|
||||
}
|
||||
return $this->create_file_from_string($filerecord, $content);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user