--- trunk/lib/Frey/HTML.pm	2008/06/29 20:49:42	31
+++ trunk/lib/Frey/HTML.pm	2008/06/29 20:52:33	32
@@ -19,7 +19,6 @@
 
 our @view_classes = qw(
 	Frey::View
-	Frey::REST
 	Strix::View
 );
 
@@ -56,7 +55,7 @@
 					{ type is 'text/javascript' }
 					{ src is "/$js" }
 				}
-			}
+			};
 		}
 		body {
 			$orig->();
@@ -74,15 +73,14 @@
 =cut
 
 sub page {
-	my $self = shift;
-	warn "## page ",dump($_[0],ref($_[1]),$_[2]),"\n";
-	my $page = eval { Template::Declare->show( @_ ) };
+	my ( $self, $page, $req, $args ) = @_;
+	warn "## page $page ",dump($args),"\n";
+	my $out = eval { Template::Declare->show( $page, $req, $args ) };
 	if ( $@ ) {
 		carp "ERROR: $@";
-		$page = Template::Declare->show( 'error', $_[1], "page" . dump($_[0], ref($_[1])) . "\n$@" );
-		warn $page;
+		$out = Template::Declare->show( 'error', $req, "page $page " . dump($args) . ": $@" );
 	}
-	return $page;
+	return $out;
 }
 
 =head2 add_javascript