"MDL-21102, fixed fatal php error in file picker"

diff --git a/repository/local/repository.class.php b/repository/local/repository.class.php
index d144269cdcd62d9f8087b971b215170628ed9553..c1c45c266d99dadbd848742f6c4b2839c607e257 100755 (executable)
--- 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 d74491d793734d19e0102f0869763d0bccf6bec9..b16366a531e00847a5a2ab734436ab68c2ef3c11 100755 (executable)
--- 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');