comparison Options.inc @ 85:590e6950fa7f

Branch merge.
author Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date Mon, 15 Oct 2012 16:53:29 +0200
parents 2a8e2f571b24
children d98e315308cd
comparison
equal deleted inserted replaced
84:3a1e20a5b67a 85:590e6950fa7f
67 { 67 {
68 if ($this->baseUrl) 68 if ($this->baseUrl)
69 return $this->baseUrl; 69 return $this->baseUrl;
70 70
71 $request = $_SERVER['REQUEST_URI']; 71 $request = $_SERVER['REQUEST_URI'];
72
72 $l = strpos($request, '?'); 73 $l = strpos($request, '?');
73 $base = ($l) ? substr($request, 0 , $l) : $request; 74 $base = ($l) ? substr($request, 0 , $l) : $request;
75 $base = rtrim($base, '/');
74 76
75 return "http://" . $_SERVER['HTTP_HOST'] . $base; 77 return "http://" . $_SERVER['HTTP_HOST'] . $base;
76 } 78 }
77 79
78 /** 80 /**