Merge branch 'MDL-23872_m21' of git://github.com/nebgor/moodle into MOODLE_21_STABLE

2011-08-16 11:51:53 +02:00
parent 28f9b39287 339c198ade
commit a6f18c98f4
1 changed files with 4 additions and 0 deletions
@@ -1574,6 +1574,10 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
            }
        }

+        if (is_array($this->_constantValues)) {
+            $unfiltered = HTML_QuickForm::arrayMerge($unfiltered, $this->_constantValues);
+        }
+
        return $unfiltered;
    }
    /**