Merge branch 'master' into events/33c3

1 files changed, 6 insertions, 4 deletions

diff --git a/model/RoomSelection.php b/model/RoomSelection.php
index 9f0b16d..9211c31 100644
--- a/model/RoomSelection.php
+++ b/model/RoomSelection.php
@@ -20,16 +20,18 @@ class RoomSelection
 
 	public function getLink()
 	{
+		$path = [$this->getRoom()->getConference()->getSlug(), $this->getRoom()->getSlug()];
+
 		$selection = $this->getRoom()->getSelectionNames();
-		if($selection[0] == $this->getSelection())
-			return rawurlencode($this->getRoom()->getSlug()).'/';
+		if($selection[0] != $this->getSelection())
+			$path[] = $this->getSelection();
 
-		return rawurlencode($this->getRoom()->getSlug()).'/'.rawurlencode($this->getSelection()).'/';
+		return joinpath($path).url_params();
 	}
 
 	public function getTranslatedLink()
 	{
-		return $this->getLink().'translated/';
+		return joinpath([$this->getLink(), 'translated']);
 	}
 
 	public function getDisplay()