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

Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2012-06-07 13:02:38 +08:00
parent 3872cae1eb 3c693ff4d2
commit 2960a22052
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/draftfiles_manager.php
+2 -1
View File
@@ -333,7 +333,8 @@ default:
$home_url->param('action', 'browse');
$home_url->param('draftpath', $file->filepath);
$foldername = trim(array_pop(explode('/', trim($file->filepath, '/'))), '/');
$filepathchunks = explode('/', trim($file->filepath, '/'));
$foldername = trim(array_pop($filepathchunks), '/');
echo html_writer::link($home_url, $foldername);
$home_url->param('draftpath', $file->filepath);
repository/filepicker.php
+9 -2
View File
@@ -67,7 +67,7 @@ $draftpath = optional_param('draftpath', '/', PARAM_PATH);
// user context
$user_context = get_context_instance(CONTEXT_USER, $USER->id);
$user_context = context_user::instance($USER->id);
$PAGE->set_context($user_context);
if (!$course = $DB->get_record('course', array('id'=>$courseid))) {
@@ -298,7 +298,14 @@ case 'download':
$record->itemid = $itemid;
$record->license = '';
$record->author = '';
$record->source = $thefile['url'];
$now = time();
$record->timecreated = $now;
$record->timemodified = $now;
$record->userid = $USER->id;
$record->contextid = $user_context->id;
$record->source = serialize((object)array('source' => $thefile['url']));
try {
$info = repository::move_to_filepool($thefile['path'], $record);
redirect($home_url, get_string('downloadsucc', 'repository'));