From 6926df754e9250d9f0766d0ee34044ff1a319103 Mon Sep 17 00:00:00 2001 From: Dongsheng Cai Date: Tue, 15 Dec 2009 08:00:11 +0000 Subject: [PATCH] "MDL-21102, fixed fatal php error in file picker" --- repository/local/repository.class.php | 3 ++- repository/repository_ajax.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repository/local/repository.class.php b/repository/local/repository.class.php index d144269cdc..c1c45c266d 100755 --- a/repository/local/repository.class.php +++ b/repository/local/repository.class.php @@ -158,12 +158,13 @@ class repository_local extends repository { $filename = $params['filename']; $fileitemid = $params['itemid']; $context = get_context_instance_by_id($contextid); - $file_info = $browser->get_file_info($context, $filearea, $fileitemid, $filepath, $filename); + $file_info = $browser->get_file_info($context, $filearea, $fileitemid, $filepath, $filename); $file_info->copy_to_storage($user_context->id, 'user_draft', $itemid, $save_path, $title); $ret['itemid'] = $itemid; $ret['title'] = $title; $ret['contextid'] = $user_context->id; + $ret['filesize'] = $file_info->get_filesize(); return $ret; } diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php index d74491d793..b16366a531 100755 --- a/repository/repository_ajax.php +++ b/repository/repository_ajax.php @@ -237,7 +237,7 @@ EOD; $info['file'] = $fileinfo['title']; $info['id'] = $itemid; $info['url'] = $CFG->httpswwwroot.'/draftfile.php/'.$fileinfo['contextid'].'/user_draft/'.$itemid.'/'.$fileinfo['title']; - $filesize = $fileinfo->get_filesize(); + $filesize = $fileinfo['filesize']; if (($maxbytes!==-1) && ($filesize > $maxbytes)) { $fileinfo->delete(); throw new file_exception('maxbytes'); -- 2.39.5