Merge branch 'feature/27-unwind-global-config'

1 files changed, 5 insertions, 3 deletions

diff --git a/model/RoomTab.php b/model/RoomTab.php
index 16a8359..c7b564f 100644
--- a/model/RoomTab.php
+++ b/model/RoomTab.php
@@ -20,11 +20,13 @@ class RoomTab
 
 	public function getLink()
 	{
+		$path = [$this->getRoom()->getConference()->getSlug(), $this->getRoom()->getSlug()];
+
 		$tabs = $this->getRoom()->getTabNames();
-		if($tabs[0] == $this->getTab())
-			return rawurlencode($this->getRoom()->getSlug()).'/'.url_params();
+		if($tabs[0] != $this->getTab())
+			$path[] = $this->getTab();
 
-		return rawurlencode($this->getRoom()->getSlug()).'/'.rawurlencode($this->getTab()).'/'.url_params();
+		return joinpath($path).url_params();
 	}
 
 	public function getDisplay()