From 251066735d9b3392ba7ea35da2fc0d6cd896e3a1 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Tue, 15 Feb 2011 00:01:27 -0600
Subject: some fixups for minor ox changes

---
 lib/Narwhal.pm                | 2 ++
 lib/Narwhal/Component/Wiki.pm | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Narwhal.pm b/lib/Narwhal.pm
index 240b504..66aabb7 100644
--- a/lib/Narwhal.pm
+++ b/lib/Narwhal.pm
@@ -1,6 +1,8 @@
 package Narwhal;
 use OX;
 
+with 'OX::Role::WithAppRoot';
+
 config kioku_dsn => 'dbi:SQLite:narwhal.db';
 config kioku_extra_args => sub { { create => 1 } };
 config template_root => sub {
diff --git a/lib/Narwhal/Component/Wiki.pm b/lib/Narwhal/Component/Wiki.pm
index 5b89816..fa07342 100644
--- a/lib/Narwhal/Component/Wiki.pm
+++ b/lib/Narwhal/Component/Wiki.pm
@@ -34,7 +34,7 @@ sub page {
     return $req->new_response(404)
         unless $page_obj;
     my $out;
-    $self->process('page.tt', { uri_for => sub { '/' . $req->uri_for({@_}) }, text => $page_obj->text, page => $page }, \$out);
+    $self->process('page.tt', { uri_for => sub { $req->uri_for({@_}) }, text => $page_obj->text, page => $page }, \$out);
     return $req->new_response(200, [], $out);
 }
 
@@ -48,13 +48,13 @@ sub edit {
             $self->insert("page:$page" => $page_obj);
         });
         my $res = $req->new_response(303);
-        $res->location('/' . $req->uri_for({controller => 'wiki', action => 'page', page_name => $page}));
+        $res->location($req->uri_for({controller => 'wiki', action => 'page', page_name => $page}));
         return $res;
     }
     else {
         my $page_obj = $self->lookup("page:$page");
         my $out;
-        $self->process('edit.tt', { uri_for => sub { '/' . $req->uri_for({@_}) }, text => ($page_obj ? $page_obj->text : ''), page => $page }, \$out);
+        $self->process('edit.tt', { uri_for => sub { $req->uri_for({@_}) }, text => ($page_obj ? $page_obj->text : ''), page => $page }, \$out);
         return $req->new_response(200, [], $out);
     }
 }
-- 
cgit v1.2.3