Commit a6e2c902 authored by Dries's avatar Dries
Browse files

- Patch #206512 by jvandyk: fixed grammar mistake in status message.

parent 258b5760
......@@ -126,7 +126,8 @@ function trigger_assign_form($form_state, $hook, $op, $description) {
$options = array();
$functions = array();
// Restrict the options list to actions that declare support for this hook-op combination.
// Restrict the options list to actions that declare support for this hook-op
// combination.
foreach (actions_list() as $func => $metadata) {
if (isset($metadata['hooks']['any']) || (isset($metadata['hooks'][$hook]) && is_array($metadata['hooks'][$hook]) && (in_array($op, $metadata['hooks'][$hook])))) {
$functions[] = $func;
......@@ -177,6 +178,7 @@ function trigger_assign_form($form_state, $hook, $op, $description) {
}
return $form;
}
/**
* Validation function for trigger_assign_form().
*
......@@ -187,7 +189,7 @@ function trigger_assign_form_validate($form, $form_state) {
if (!empty($form_values['aid'])) {
$aid = actions_function_lookup($form_values['aid']);
if (db_result(db_query("SELECT aid FROM {trigger_assignments} WHERE hook = '%s' AND op = '%s' AND aid = '%s'", $form_values['hook'], $form_values['operation'], $aid))) {
form_set_error($form_values['operation'], t('The action you choose is already assigned to that trigger.'));
form_set_error($form_values['operation'], t('The action you chose is already assigned to that trigger.'));
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment