From ee691c593adfaf4c8046cf6ee2bc9796a28a1448 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 22 Aug 2010 11:04:09 +0000
Subject: - Patch #887102 by Heine: trigger and action escaping issues.
 Critical bug fix.

---
 modules/trigger/trigger.admin.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/trigger')

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']
       );
     }
-- 
cgit v1.2.3