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

MDL-22950 adding new component column to the files table, unfortunately this change requires changes in all 2.0dev code, please review all custom code that was already upgraded to 2.0; fixing multiple problems and regressions in mod/assignment

Browse Source
This commit is contained in:
Petr Skoda
2010-07-03 13:37:13 +00:00
parent ffc3f866d5
commit 64f93798d4
220 changed files with 4713 additions and 4375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/resourcelib.php
+4 -3
View File
@@ -51,11 +51,12 @@ define('RESOURCELIB_LEGACYFILES_ACTIVE', 2);
* @param string $filepath old file path
* @param int $cmid migrated course module if
* @param int $courseid
* @param string $component
* @param string $filearea new file area
* @param int $itemid migrated file item id
* @return mixed, false if not found, stored_file instance if migrated to new area
*/
function resourcelib_try_file_migration($filepath, $cmid, $courseid, $filearea, $itemid) {
function resourcelib_try_file_migration($filepath, $cmid, $courseid, $component, $filearea, $itemid) {
$fs = get_file_storage();
if (stripos($filepath, '/backupdata/') === 0 or stripos($filepath, '/moddata/') === 0) {
@@ -70,13 +71,13 @@ function resourcelib_try_file_migration($filepath, $cmid, $courseid, $filearea,
return false;
}
$pathnamehash = sha1($coursecontext->id.'course_content0'.$filepath);
$pathnamehash = sha1("/$coursecontext->id/course/legacy/0".$filepath);
if (!$file = $fs->get_file_by_hash($pathnamehash)) {
return false;
}
// copy and keep the same path, name, etc.
$file_record = array('contextid'=>$context->id, 'filearea'=>$filearea, 'itemid'=>$itemid);
$file_record = array('contextid'=>$context->id, 'component'=>$component, 'filearea'=>$filearea, 'itemid'=>$itemid);
try {
return $fs->create_file_from_storedfile($file_record, $file);
} catch (Exception $e) {