Merge branch 'mdl41908-master' of https://github.com/tlock/moodle

This commit is contained in:
Dan Poltawski 2013-10-09 10:27:07 +08:00
commit 9d841c6c90

View file

@ -600,7 +600,8 @@ class HTML_QuickForm extends HTML_Common {
} else {
$args = func_get_args();
$elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1));
if (@PEAR::isError($elementObject)) {
$pear = new PEAR();
if ($pear->isError($elementObject)) {
return $elementObject;
}
}
@ -1875,7 +1876,8 @@ class HTML_QuickForm extends HTML_Common {
}
foreach ($elementList as $elementName) {
$value = $this->exportValue($elementName);
if (PEAR::isError($value)) {
$pear = new PEAR();
if ($pear->isError($value)) {
return $value;
}
$values[$elementName] = $value;