Merge branch 'MDL-61016_hideif_disabledif' of git://github.com/davosm…

…ith/moodle
moodle · Dec 19, 2017 · dcae64d · dcae64d
2 parents 7a1a9ec + 8fc3d41
commit dcae64d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/formslib.php b/lib/formslib.php
@@ -2492,9 +2492,13 @@ function getLockOptionObject(){
             }
         }
         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) {