changeset 85:590e6950fa7f

Branch merge.
author Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date Mon, 15 Oct 2012 16:53:29 +0200
parents 3a1e20a5b67a (current diff) 2a8e2f571b24 (diff)
children b9654b9c4a66
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
   }
--- 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;