From 148e093abb974d4f818a34122c3da2cebf9d6d21 Mon Sep 17 00:00:00 2001
From: poltawski <poltawski>
Date: Mon, 6 Aug 2007 13:28:40 +0000
Subject: [PATCH] MDL-10715 - remove inappropiate 'upload not allowed' options
 on upload assignment types!

Merged from MOODLE_18_STABLE
---
 mod/assignment/type/upload/assignment.class.php       | 1 -
 mod/assignment/type/uploadsingle/assignment.class.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 252087d5ab..607a4dcde6 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -921,7 +921,6 @@ class assignment_upload extends assignment_base {
         $ynoptions = array( 0 => get_string('no'), 1 => get_string('yes'));
 
         $choices = get_max_upload_sizes($CFG->maxbytes, $COURSE->maxbytes);
-        $choices[1] = get_string('uploadnotallowed');
         $choices[0] = get_string('courseuploadlimit') . ' ('.display_size($COURSE->maxbytes).')';
         $mform->addElement('select', 'maxbytes', get_string('maximumsize', 'assignment'), $choices);
         $mform->setDefault('maxbytes', $CFG->assignment_maxbytes);
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index b74dcbc14d..53d6e48af4 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -173,7 +173,6 @@ class assignment_uploadsingle extends assignment_base {
         $mform->setDefault('emailteachers', 0);
 
         $choices = get_max_upload_sizes($CFG->maxbytes, $COURSE->maxbytes);
-        $choices[1] = get_string('uploadnotallowed');
         $choices[0] = get_string('courseuploadlimit') . ' ('.display_size($COURSE->maxbytes).')';
         $mform->addElement('select', 'maxbytes', get_string('maximumsize', 'assignment'), $choices);
         $mform->setDefault('maxbytes', $CFG->assignment_maxbytes);
-- 
2.39.5