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 /includes/actions.inc | |
| 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 'includes/actions.inc')
| -rw-r--r-- | includes/actions.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/actions.inc b/includes/actions.inc index 129f38d3b..8ee7d5129 100644 --- a/includes/actions.inc +++ b/includes/actions.inc @@ -292,7 +292,7 @@ function actions_synchronize($delete_orphans = FALSE) { 'label' => $array['label'], )) ->execute(); - watchdog('actions', "Action '%action' added.", array('%action' => filter_xss_admin($array['label']))); + watchdog('actions', "Action '%action' added.", array('%action' => $array['label'])); } } } @@ -305,7 +305,7 @@ function actions_synchronize($delete_orphans = FALSE) { $actions = db_query('SELECT aid, label FROM {actions} WHERE callback IN (:orphaned)', array(':orphaned' => $orphaned))->fetchAll(); foreach ($actions as $action) { actions_delete($action->aid); - watchdog('actions', "Removed orphaned action '%action' from database.", array('%action' => filter_xss_admin($action->label))); + watchdog('actions', "Removed orphaned action '%action' from database.", array('%action' => $action->label)); } } else { |