MDL-13741 Incorrect max size shown when using course upload limit; patch by Jason...

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 0b8fe8a8d27bb39024c95fc4165d34657871eccf..e76dd61099b97ea7ab403e7a0d655cd164d39eda 100644 (file)
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -140,7 +140,8 @@ class assignment_upload extends assignment_base {
         $submission = $this->get_submission($USER->id);
 
         $struploadafile = get_string('uploadafile');
-        $strmaxsize = get_string('maxsize', '', display_size($this->assignment->maxbytes));
+        $maxbytes = $this->assignment->maxbytes == 0 ? $this->course->maxbytes : $this->assignment->maxbytes; 
+        $strmaxsize = get_string('maxsize', '', display_size($maxbytes));
 
         if ($this->is_finalized($submission)) {
             // no uploading

diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index 491538e9189128028101239bf0ade1868aa46424..63375a72cb02cee8d5ed9f30c0422fda7a5e8366 100644 (file)
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -81,7 +81,9 @@ class assignment_uploadsingle extends assignment_base {
     function view_upload_form() {
         global $CFG;
         $struploadafile = get_string("uploadafile");
-        $strmaxsize = get_string("maxsize", "", display_size($this->assignment->maxbytes));
+
+        $maxbytes = $this->assignment->maxbytes == 0 ? $this->course->maxbytes : $this->assignment->maxbytes; 
+        $strmaxsize = get_string('maxsize', '', display_size($maxbytes));
 
         echo '<div style="text-align:center">';
         echo '<form enctype="multipart/form-data" method="post" '.