From c7fb7fa370f11653673546117314b0cb3c543702 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Sat, 26 Apr 2014 10:37:37 +0800 Subject: [PATCH] MDL-45280 wrtie default value for admin_setting_configstoredfile this fixes regression from MDL-45134 --- lib/adminlib.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/adminlib.php b/lib/adminlib.php index a0fccbab5e7..ac4f6ffa71e 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -8472,7 +8472,10 @@ class admin_setting_configstoredfile extends admin_setting { // Let's not deal with validation here, this is for admins only. $current = $this->get_setting(); - if (!is_number($data)) { + if (empty($data) && $current === null) { + // This will be the case when applying default settings (installation). + return ($this->config_write($this->name, '') ? '' : get_string('errorsetting', 'admin')); + } else if (!is_number($data)) { // Draft item id is expected here! return get_string('errorsetting', 'admin'); }