From 387f7aae0d8b41969e48e1b489f9813520be2830 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 5 Dec 2017 09:49:33 +0800
Subject: [PATCH] MDL-36056 forms: Don't validate disabled fields

When fields are disabled, the value comes through as null so we need to specifically check for it
before validation.
---
 lib/form/passwordunmask.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/form/passwordunmask.php b/lib/form/passwordunmask.php
index 224f756e10b..e90ee4df89f 100644
--- a/lib/form/passwordunmask.php
+++ b/lib/form/passwordunmask.php
@@ -101,8 +101,7 @@ class MoodleQuickForm_passwordunmask extends MoodleQuickForm_password {
      * @return string|null Validation error message or null.
      */
     public function validateSubmitValue($value) {
-
-        if ($value !== trim($value)) {
+        if ($value !== null && $value !== trim($value)) {
             return get_string('err_wrappingwhitespace', 'core_form');
         }