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

2011-08-16 11:52:32 +02:00
parent bfe5eed065 1ee988357f
commit 2a44c5192c
1 changed files with 4 additions and 0 deletions
@@ -1145,6 +1145,10 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
            }
        }

+        if (is_array($this->_constantValues)) {
+            $unfiltered = HTML_QuickForm::arrayMerge($unfiltered, $this->_constantValues);
+        }
+
        if ($addslashes){
            return $this->_recursiveFilter('addslashes', $unfiltered);
        } else {