--- trunk/lib/Frey/ClassBrowser.pm	2008/11/27 17:39:00	555
+++ trunk/lib/Frey/ClassBrowser.pm	2008/11/27 22:11:13	570
@@ -27,13 +27,15 @@
 
 		my $icon = '';
 		if ( ! $self->can('icon_path') ) {
-			warn "FIXME: re-apply Frey::Web on $self";
+			$self->TODO( "re-apply Frey::Web on $self" );
 			Frey::Web->meta->apply( $self );
 		}
 		$icon = $self->icon_path( $class );
 		if ($icon) {
 			push @icons, $icon;
 			$icon = qq|<!-- icon:$icon -->|;
+		} else {
+			$icon = '';
 		}
 
 		my $html
@@ -72,7 +74,7 @@
 
 	my $icons_html = $self->combine_images( @icons );
 	sub icon {
-		my $path = shift;
+		my ($icons_html,$path) = @_;
 		warn "# icon $path";
 		$icons_html->{ $path } || die "can't find $path in ",dump($icons_html);
 	};
@@ -81,7 +83,7 @@
 		qq|<table>| . join("\n",
 			map {
 				my $html = $row->{$_};
-				$html =~ s{<!-- icon:(\S+) -->}{icon($1)}gse;
+				$html =~ s{<!-- icon:(\S+) -->}{icon($icons_html,$1)}gse;
 				$html;
 			}
 			sort {