From f6c0270d40f6730fe1e1820f2866b08792df1db6 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:22:34 +0100
Subject: rewrite data-model so that every configuration option is accessed
 through the conference

---
 lib/helper.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/helper.php')

diff --git a/lib/helper.php b/lib/helper.php
index 4fce91e..df7f329 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -18,14 +18,20 @@ function baseurl()
 		if(startswith('//', $base))
 			$base = proto().':'.$base;
 
-		return forceslash(forceslash($base).@$GLOBALS['MANDATOR']);
+		return forceslash($base);
 	}
 
 	$base  = ssl() ? 'https://' : 'http://';
 	$base .= $_SERVER['HTTP_HOST'];
 	$base .=  forceslash(dirname($_SERVER['SCRIPT_NAME']));
 
-	return forceslash(forceslash($base).@$GLOBALS['MANDATOR']);
+	return forceslash($base);
+}
+
+function joinpath($parts)
+{
+	$parts = array_map('forceslash', $parts);
+	return rtrim(implode('', $parts), '/');
 }
 
 function forceslash($url)
-- 
cgit v1.2.3