# HG changeset patch
# User Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
# Date 1350312809 -7200
# Node ID 590e6950fa7fe8273147155e39a0d6da5474ef38
# Parent  3a1e20a5b67ae5bc5597cb8eb46376c0a4921e1b# Parent  2a8e2f571b246c315816a1b25bc7e68f69785c33
Branch merge.

diff -r 3a1e20a5b67a -r 590e6950fa7f Options.inc
--- a/Options.inc	Mon Oct 15 16:52:50 2012 +0200
+++ b/Options.inc	Mon Oct 15 16:53:29 2012 +0200
@@ -69,8 +69,10 @@
       return $this->baseUrl;
 
     $request = $_SERVER['REQUEST_URI'];
+
     $l = strpos($request, '?');
     $base = ($l) ? substr($request, 0 , $l) : $request;
+    $base = rtrim($base, '/');
 
     return "http://" . $_SERVER['HTTP_HOST'] . $base;
   }
diff -r 3a1e20a5b67a -r 590e6950fa7f Page.inc
--- a/Page.inc	Mon Oct 15 16:52:50 2012 +0200
+++ b/Page.inc	Mon Oct 15 16:53:29 2012 +0200
@@ -10,7 +10,7 @@
 /**
  * Master class for generating a page
  */
-class Page
+abstract class Page
 {
   private $cache;