Merge branch 'MDL-45284_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Sam Hemelryk 2014-04-28 14:09:18 +12:00
commit 0e7408683f

View File

@ -54,10 +54,15 @@ class behat_field_manager {
try {
// The DOM node.
$fieldnode = $context->find_field($label);
} catch (ElementNotFoundException $e) {
} catch (ElementNotFoundException $fieldexception) {
// Looking for labels that points to filemanagers.
$fieldnode = $context->find_filemanager($label);
try {
$fieldnode = $context->find_filemanager($label);
} catch (ElementNotFoundException $filemanagerexception) {
// We want the generic 'field' exception.
throw $fieldexception;
}
}
// The behat field manager.