From 9f9fe26bdde914ea5d090755b30c39fc1d6a468a Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Tue, 3 Mar 2015 11:20:45 +0100
Subject: Fix Canonical-URL when deployed in a Folder

---
 lib/helper.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'lib/helper.php')

diff --git a/lib/helper.php b/lib/helper.php
index 4beef4d..91583d1 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -86,11 +86,20 @@ function baseurl()
 
 	$base  = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']) ? 'https://' : 'http://';
 	$base .= $_SERVER['HTTP_HOST'];
-	$base .=  rtrim(dirname($_SERVER['SCRIPT_NAME']), '/').'/';
+	$base .=  forceslash(dirname($_SERVER['SCRIPT_NAME']));
 
 	return $base;
 }
 
+function forceslash($url)
+{
+	$url =  rtrim($url, '/');
+	if(strlen($url) > 0)
+		$url .= '/';
+
+	return $url;
+}
+
 function strtoduration($str)
 {
 	$parts = explode(':', $str);
-- 
cgit v1.2.3