Merge branch 'MDL-61625_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2018-03-14 01:00:13 +01:00
commit dd9f60ee49

View file

@ -80,9 +80,10 @@ abstract class persistent extends moodleform {
* @param string $target
* @param mixed $attributes
* @param bool $editable
* @param array $ajaxformdata
*/
public function __construct($action = null, $customdata = null, $method = 'post', $target = '',
$attributes = null, $editable = true) {
$attributes = null, $editable = true, $ajaxformdata=null) {
if (empty(static::$persistentclass)) {
throw new coding_exception('Static property $persistentclass must be set.');
} else if (!is_subclass_of(static::$persistentclass, 'core\\persistent')) {
@ -106,7 +107,7 @@ abstract class persistent extends moodleform {
$this->persistent->from_record($persistendata);
unset($customdata['persistent']);
parent::__construct($action, $customdata, $method, $target, $attributes, $editable);
parent::__construct($action, $customdata, $method, $target, $attributes, $editable, $ajaxformdata);
// Load the defaults.
$this->set_data($this->get_default_data());