From 8fc3d41139f1899fbda88cf6e2e35c24a0b32ac8 Mon Sep 17 00:00:00 2001
From: Davo Smith <davo.smith@synergy-learning.com>
Date: Tue, 12 Dec 2017 14:52:32 +0000
Subject: [PATCH] MDL-61016 form: fix handling disabledIf + hideIf with same
 dependency

---
 lib/formslib.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/formslib.php b/lib/formslib.php
index 77efbe95d04..3a3b6022229 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -2492,9 +2492,13 @@ require(["core/event", "jquery"], function(Event, $) {
             }
         }
         foreach ($this->_hideifs as $dependenton => $conditions) {
-            $result[$dependenton] = array();
+            if (!isset($result[$dependenton])) {
+                $result[$dependenton] = array();
+            }
             foreach ($conditions as $condition => $values) {
-                $result[$dependenton][$condition] = array();
+                if (!isset($result[$dependenton][$condition])) {
+                    $result[$dependenton][$condition] = array();
+                }
                 foreach ($values as $value => $dependents) {
                     $result[$dependenton][$condition][$value][self::DEP_HIDE] = array();
                     foreach ($dependents as $dependent) {