Merge branch 'wip-MDL-39118-master' of git://github.com/abgreeve/moodle

mod/data/field/file/field.class.php

@@ -71,7 +71,6 @@ class data_field_file extends data_field_base {
         $html .= '<input type="hidden" name="field_'.$this->field->id.'_file" value="'.$itemid.'" />';
 
         $options = new stdClass();
-        $options->areamaxbytes  = $this->field->param3;
         $options->maxbytes = $this->field->param3;
         $options->maxfiles  = 1; // Limit to one file for the moment, this may be changed if requested as a feature in the future.
         $options->itemid    = $itemid;

mod/data/field/picture/field.class.php

@@ -75,7 +75,6 @@ class data_field_picture extends data_field_base {
         $str .= '</noscript>';
 
         $options = new stdClass();
-        $options->areamaxbytes = $this->field->param3;
         $options->maxbytes  = $this->field->param3;
         $options->maxfiles  = 1; // Only one picture permitted.
         $options->itemid    = $itemid;