- Patch #572618 by effulgentsia, pwolanin, sun: all theme functions should take a single argument. Code clean-up and performance improvement. Woot.

2 files changed, 9 insertions, 5 deletions

diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc
index 9db7a928f..e3350f80c 100644
--- a/modules/trigger/trigger.admin.inc
+++ b/modules/trigger/trigger.admin.inc
@@ -255,14 +255,18 @@ function trigger_assign_form_submit($form, $form_state) {
 /**
  * Displays actions assigned to this hook in a table.
  *
- * @param array $element
- *   The fieldset including all assigned actions.
+ * @param $variables
+ *   An associative array containing:
+ *   - element: The fieldset including all assigned actions.
+ *
  * @return
  *   The rendered form with the table prepended.
  *
  * @ingroup themeable
  */
-function theme_trigger_display($element) {
+function theme_trigger_display($variables) {
+  $element = $variables['element'];
+
   $header = array();
   $rows = array();
   if (isset($element['assigned']) && count($element['assigned']['#value'])) {
@@ -277,7 +281,7 @@ function theme_trigger_display($element) {
   }
 
   if (count($rows)) {
-    $output = theme('table', $header, $rows) . drupal_render_children($element);
+    $output = theme('table', array('header' => $header, 'rows' => $rows)) . drupal_render_children($element);
   }
   else {
     $output = drupal_render_children($element);
diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module
index d889007e4..7c831ebe4 100644
--- a/modules/trigger/trigger.module
+++ b/modules/trigger/trigger.module
@@ -180,7 +180,7 @@ function trigger_get_assigned_actions($hook) {
 function trigger_theme() {
   return array(
     'trigger_display' => array(
-      'arguments' => array('element'),
+      'arguments' => array('element' => NULL),
       'file' => 'trigger.admin.inc',
     ),
   );