--- api-DRUPAL-6--1/api.module	2010-05-11 23:01:14.000000000 +0200
+++ api.module	2010-05-11 22:10:16.000000000 +0200
@@ -1946,15 +1946,9 @@ function api_class_children($class) {
 function api_inherited($class, $last_did, $types = 'function', $members = array()) {
   foreach (api_members($class, $types) as $objects) {
     foreach ($objects as $object) {
-      if ($class->did === $last_did) {
-        if (isset($members[$object->object_type][$object->title])) {
-          $object->link_overrides =  l(strip_tags($members[$object->object_type][$object->title]->link_inherited), api_url($members[$object->object_type][$object->title]));
-        }
+      if ($class->did != $last_did) {
+        $object->class_link = l($class->title, api_url($class));
       }
-      else {
-        $object->link_inherited = l($class->title, api_url($class));
-      }
-      
       $members[$object->object_type][$object->title] = $object;
     }
   }
@@ -2064,12 +2058,10 @@ function api_render_members($list, $link
         $row[] = '<small>' . api_file_link($object) . '</small>';
       }
       $summary = api_link_documentation($object->summary, $branches[$object->branch_id]);
-      $source = isset($object->link_overrides) ? " <em class='api-inheritance-source'>" . t('Overrides !link', array('!link' => $object->link_overrides)) . '</em>' : '';
-      if (isset($object->link_inherited) && empty($source)) {
-        $source = " <em class='api-inheritance-source'>" . t('Inherited from !link', array('!link' => $object->link_inherited)) . '</em>';
+      if (!empty($object->class_link)) {
+        $summary .= ' <em>' . t('Inherited from !link', array('!link' => $object->class_link)) . '</em>';
       }
-
-      $row[] = $summary . $source;
+      $row[] = $summary;
       $rows[] = $row;
     }
     $return[$type] = theme('table', $header, $rows);