Index: api.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/api/api.module,v
retrieving revision 1.88.2.78
diff -u -r1.88.2.78 api.module
--- api.module	7 Apr 2010 06:16:27 -0000	1.88.2.78
+++ api.module	8 Apr 2010 18:45:49 -0000
@@ -1107,7 +1107,7 @@
   $last_signature = '';
   $signatures = array();
   $n = 0;
-  $result = db_query("SELECT d.branch_id, f.signature FROM {api_documentation} d INNER JOIN {api_function} f ON f.did = d.did INNER JOIN {api_branch} b ON d.branch_id = b.branch_id WHERE d.object_type = 'function' AND d.title = '%s' ORDER BY b.weight", $function->title);
+  $result = db_query("SELECT d.branch_id, d.object_name, f.signature FROM {api_documentation} d INNER JOIN {api_function} f ON f.did = d.did INNER JOIN {api_branch} b ON d.branch_id = b.branch_id WHERE d.object_type = 'function' AND d.title = '%s' ORDER BY b.weight", $function->title);
   while ($signature = db_fetch_object($result)) {
     if ($signature->signature == $last_signature) {
       // Collapse unchanged signatures to one line.
@@ -1115,13 +1115,11 @@
       $signature_info[$n - 1]['active'] = $signature_info[$n - 1]['active'] || $signature->branch_id == $function->branch_id;
     }
     else {
+      // Use the object name as the function name.
+      $name = $signature->object_name;
+      // Parse the parameters, so differences between branches can be
+      // highlighted.
       $tokens = token_get_all('<?php '. $signature->signature);
-      if ($tokens[1] == '&') {
-        $name = '&'. $tokens[2][1];
-      }
-      else {
-        $name = $tokens[1][1];
-      }
       $signature_info[$n] = array(
         'branch id' => $signature->branch_id,
         'max branch' => $signature->branch_id,