moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Poltawski 2013-10-09 10:27:07 +08:00
commit 9d841c6c90
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pear/HTML/QuickForm.php
View file

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