diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-08-22 11:04:09 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-08-22 11:04:09 +0000 |
| commit | ee691c593adfaf4c8046cf6ee2bc9796a28a1448 (patch) | |
| tree | f9d1237359050e35d9c977fa16b06a99ad3dfe84 /modules/trigger | |
| parent | c72614b01e595eb52e60905fafa74e05ddbe5f9d (diff) | |
| download | brdo-ee691c593adfaf4c8046cf6ee2bc9796a28a1448.tar.gz brdo-ee691c593adfaf4c8046cf6ee2bc9796a28a1448.tar.bz2 | |
- Patch #887102 by Heine: trigger and action escaping issues. Critical bug fix.
Diffstat (limited to 'modules/trigger')
| -rw-r--r-- | modules/trigger/trigger.admin.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc index d0e12661c..33a3fc3f8 100644 --- a/modules/trigger/trigger.admin.inc +++ b/modules/trigger/trigger.admin.inc @@ -90,7 +90,7 @@ function trigger_unassign_submit($form, &$form_state) { ->condition('aid', $aid) ->execute(); $actions = actions_get_all_actions(); - watchdog('actions', 'Action %action has been unassigned.', array('%action' => check_plain($actions[$aid]['label']))); + watchdog('actions', 'Action %action has been unassigned.', array('%action' => $actions[$aid]['label'])); drupal_set_message(t('Action %action has been unassigned.', array('%action' => $actions[$aid]['label']))); $form_state['redirect'] = 'admin/structure/trigger/' . $form_state['values']['module']; } @@ -291,7 +291,7 @@ function theme_trigger_display($variables) { $rows = array(); foreach ($element['assigned']['#value'] as $aid => $info) { $rows[] = array( - $info['label'], + check_plain($info['label']), $info['link'] ); } |