mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

MDL-16390 - detect duplicates when copying files to portfolio export area and handle it nicer

Browse Source 
this will mean that there will only be one file, and the filename will be set to whatever the first one was, but it's better than getting the error.
This commit is contained in:
mjollnir_ 2008-09-09 09:56:56 +00:00
parent 89ee3c7937
commit 2ddd044af8
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/portfolio/exporter.php
View File

@ -106,6 +106,13 @@ class portfolio_exporter {
*/
private $alreadystolen;
/**
* files that the exporter has written to this temp area
* keep track of this in case of duplicates within one export
* see MDL-16390
*/
private $newfilehashes;
/**
* construct a new exporter for use
*
@ -126,6 +133,7 @@ class portfolio_exporter {
$this->navigation = $navigation;
$this->caller->set('exporter', $this);
$this->alreadystolen = array();
$this->newfilehashes = array();
}
/*
@ -621,10 +629,15 @@ class portfolio_exporter {
* @return new stored_file object
*/
public function copy_existing_file($oldfile) {
if (array_key_exists($oldfile->get_contenthash(), $this->newfilehashes)) {
return $this->newfilehashes[$oldfile->get_contenthash()];
}
$fs = get_file_storage();
$file_record = $this->new_file_record_base($oldfile->get_filename());
try {
return $fs->create_file_from_storedfile($file_record, $oldfile->get_id());
$newfile = $fs->create_file_from_storedfile($file_record, $oldfile->get_id());
$this->newfilehashes[$newfile->get_contenthash()] = $newfile;
return $newfile;
} catch (file_exception $e) {
return false;
}