From 5933f064fb81319206527734fe3d2b1365658ccf Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Fri, 2 Jul 2010 06:23:19 +0000 Subject: [PATCH] admin MDL-23049 Fixed bug with colour picker admin setting and added support for empty values --- lib/adminlib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/adminlib.php b/lib/adminlib.php index a42016998fd..d6971734809 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -7312,8 +7312,10 @@ class admin_setting_configcolourpicker extends admin_setting { $data = '#'.$data; } return $data; - } else if (preg_match('/^[a-zA-Z]{3, 25}$/')) { + } else if (preg_match('/^[a-zA-Z]{3, 25}$/', $data)) { return $data; + } else if (empty($data)) { + return null; } else { return false; }