? 371235-patched-benchmarks.txt
? 371235-unpatched-benchmarks.txt
? sites/all/modules/cvs
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.693
diff -u -p -r1.693 comment.module
--- modules/comment/comment.module	18 Feb 2009 15:19:55 -0000	1.693
+++ modules/comment/comment.module	23 Feb 2009 06:09:29 -0000
@@ -2060,9 +2060,9 @@ function vancode2int($c = '00') {
 }
 
 /**
- * Implementation of hook_hook_info().
+ * Implementation of hook_trigger_info().
  */
-function comment_hook_info() {
+function comment_trigger_info() {
   return array(
     'comment' => array(
       'comment' => array(
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1026
diff -u -p -r1.1026 node.module
--- modules/node/node.module	22 Feb 2009 16:53:41 -0000	1.1026
+++ modules/node/node.module	23 Feb 2009 06:09:32 -0000
@@ -2829,9 +2829,9 @@ function theme_node_submitted($node) {
 }
 
 /**
- * Implementation of hook_hook_info().
+ * Implementation of hook_trigger_info().
  */
-function node_hook_info() {
+function node_trigger_info() {
   return array(
     'node' => array(
       'nodeapi' => array(
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.668
diff -u -p -r1.668 system.module
--- modules/system/system.module	22 Feb 2009 17:55:30 -0000	1.668
+++ modules/system/system.module	23 Feb 2009 06:09:44 -0000
@@ -1574,9 +1574,9 @@ function system_cron() {
 }
 
 /**
- * Implementation of hook_hook_info().
+ * Implementation of hook_trigger_info().
  */
-function system_hook_info() {
+function system_trigger_info() {
   return array(
     'system' => array(
       'cron' => array(
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.461
diff -u -p -r1.461 taxonomy.module
--- modules/taxonomy/taxonomy.module	11 Feb 2009 03:53:36 -0000	1.461
+++ modules/taxonomy/taxonomy.module	23 Feb 2009 06:09:44 -0000
@@ -1461,9 +1461,9 @@ function taxonomy_implode_tags($tags, $v
 }
 
 /**
- * Implementation of hook_hook_info().
+ * Implementation of hook_trigger_info().
  */
-function taxonomy_hook_info() {
+function taxonomy_trigger_info() {
   return array(
     'taxonomy' => array(
       'taxonomy' => array(
Index: modules/trigger/trigger.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.admin.inc,v
retrieving revision 1.8
diff -u -p -r1.8 trigger.admin.inc
--- modules/trigger/trigger.admin.inc	3 Feb 2009 18:55:32 -0000	1.8
+++ modules/trigger/trigger.admin.inc	23 Feb 2009 06:09:44 -0000
@@ -25,10 +25,10 @@ function trigger_assign($type = NULL) {
   }
 
   $output = '';
-  $hooks = module_invoke_all('hook_info');
-  foreach ($hooks as $module => $hook) {
-    if (isset($hook[$type])) {
-      foreach ($hook[$type] as $op => $description) {
+  $triggers = module_invoke_all('trigger_info');
+  foreach ($triggers as $trigger) {
+    if (isset($trigger[$type])) {
+      foreach ($trigger[$type] as $op => $description) {
         $form_id = 'trigger_' . $type . '_' . $op . '_assign_form';
         $output .= drupal_get_form($form_id, $type, $op, $description['runs when']);
       }
Index: modules/trigger/trigger.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.api.php,v
retrieving revision 1.2
diff -u -p -r1.2 trigger.api.php
--- modules/trigger/trigger.api.php	20 Dec 2008 18:24:40 -0000	1.2
+++ modules/trigger/trigger.api.php	23 Feb 2009 06:09:44 -0000
@@ -47,7 +47,7 @@
  *       modules and you simply want to declare support for all possible hooks,
  *       you can set 'hooks' => array('any' => TRUE). Common hooks are 'user',
  *       'nodeapi', 'comment', or 'taxonomy'. Any hook that has been described
- *       to Drupal in hook_hook_info() will work is a possiblity.
+ *       to Drupal in hook_trigger_info() will work is a possibility.
  *     - 'behavior': (optional) Human-readable array of behavior descriptions.
  *       The only one we have now is 'changes node property'. You will almost
  *       certainly never have to return this in your own implementations of this
@@ -121,13 +121,13 @@ function hook_action_info_alter(&$action
  *         - Each of those arrays have a key of 'runs when' and a value which is
  *           an English description of the hook.
  *
- * For example, the node_hook_info implementation has 'node' as the outermost
+ * For example, the node_trigger_info implementation has 'node' as the outermost
  * key, as that's the module it's in. Next it has 'nodeapi' as the next key,
  * as hook_nodeapi() is what applies to changes in nodes. Finally the keys
  * after that are the various operations for hook_nodeapi() that the node module
  * is exposing as triggers.
  */
-function hook_hook_info() {
+function hook_trigger_info() {
   return array(
     'node' => array(
       'nodeapi' => array(
Index: modules/trigger/trigger.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v
retrieving revision 1.28
diff -u -p -r1.28 trigger.module
--- modules/trigger/trigger.module	22 Jan 2009 12:46:07 -0000	1.28
+++ modules/trigger/trigger.module	23 Feb 2009 06:09:44 -0000
@@ -86,17 +86,16 @@ function trigger_menu() {
 
   // We want contributed modules to be able to describe
   // their hooks and have actions assignable to them.
-  $hooks = module_invoke_all('hook_info');
-  foreach ($hooks as $module => $hook) {
+  $triggers = module_invoke_all('trigger_info');
+  foreach (array_keys($triggers) as $module) {
     // We've already done these.
     if (in_array($module, array('node', 'comment', 'user', 'system', 'taxonomy'))) {
       continue;
     }
-    $info = db_result(db_query("SELECT info FROM {system} WHERE name = '%s'", $module));
-    $info = unserialize($info);
-    $nice_name = $info['name'];
+    $module_info = db_query("SELECT info FROM {system} WHERE name = :name", array(':name' => $module))->fetchField();
+    $module_info = unserialize($info);
     $items["admin/build/trigger/$module"] = array(
-      'title' => $nice_name,
+      'title' => $module_info['name'],
       'page callback' => 'trigger_assign',
       'page arguments' => array($module),
       'access arguments' => array($module),
@@ -159,11 +158,11 @@ function trigger_theme() {
  * same assignment form definition for each node-op combination.
  */
 function trigger_forms() {
-  $hooks = module_invoke_all('hook_info');
-  foreach ($hooks as $module => $info) {
-    foreach ($hooks[$module] as $hook => $ops) {
-      foreach ($ops as $op => $description) {
-        $forms['trigger_' . $hook . '_' . $op . '_assign_form'] = array('callback' => 'trigger_assign_form');
+  $triggers = module_invoke_all('trigger_info');
+  foreach (array_keys($triggers) as $module) {
+    foreach ($triggers[$module] as $trigger => $ops) {
+      foreach (array_keys($ops) as $op) {
+        $forms['trigger_' . $trigger . '_' . $op . '_assign_form'] = array('callback' => 'trigger_assign_form');
       }
     }
   }
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.965
diff -u -p -r1.965 user.module
--- modules/user/user.module	19 Feb 2009 12:09:30 -0000	1.965
+++ modules/user/user.module	23 Feb 2009 06:09:47 -0000
@@ -2537,9 +2537,9 @@ function _user_password_dynamic_validati
 }
 
 /**
- * Implementation of hook_hook_info().
+ * Implementation of hook_trigger_info().
  */
-function user_hook_info() {
+function user_trigger_info() {
   return array(
     'user' => array(
       'user' => array(