101,103c101
<   if (module_exist("taxonomy_image")) {
<     $output .= form_radios(t("Taxonomy images"), "marvin_2k_taxonomy_images", variable_get("marvin_2k_taxonomy_images", 0), array(t("Disabled"), t("Enabled")));
<   }
---
> 
137,140d134
<   if ($tabs = theme('menu_local_tasks')) {
<     $tabs;
<   }
< 
239d232
<       "tabs"	       => $tabs,
282,287c275
<   if (module_exist("taxonomy_image") && variable_get('marvin_2k_taxonomy_images', 0)) {
<     foreach (taxonomy_node_get_terms($node->nid) as $term) {
<     $images[] = l(taxonomy_image_display($term->tid, "alt='$term->name'"), "taxonomy/term/$term->tid", array('title' => $term->name));
<        }
<      }
<    } 
---
>   } 
297,298c285
<       "taxonomy_image" => $images ? "<div class=\"taxonomy-image\">". implode(' ', $images) ."</div>" : '',	
<       "node_url"       => url("node/$node->nid"),
---
>       "node_url"       => url("node/view/$node->nid"),
331c318
<     $avatar = $object->picture;
---
>     $avatar = $object->profile_avatar;
377a365
>     $output .= "    <div class=\"title\">$comment->subject</div>\n";
381d368
<     $output .= "    <div class=\"title\">$comment->subject</div>\n";
383c370
<     $output .= "    <div class=\"rating\"> Others have rated this comment: $comment->score</div>\n";
---
>     $output .= "    <div class=\"content\">$comment->comment</div>\n";
387d373
<     $output .= "    <div class=\"content\">$comment->comment</div>\n";