From a9e8f9c6f1f06f2955c5f1e5d26e59f6e5446f65 Mon Sep 17 00:00:00 2001
From: Andreas Hubel
Date: Wed, 13 Mar 2019 15:43:11 +0100
Subject: fix room name fallback

---
 model/Room.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'model/Room.php')

diff --git a/model/Room.php b/model/Room.php
index cfc14c1..e5163a5 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -68,9 +68,9 @@ class Room
 	}
 
 	public function getDisplayShort() {
-		$display_short = $this->getConference()->get('ROOMS.'.$this->getSlug().'.DISPLAY_SHORT', $this->getSlug());
+		$display_short = $this->getConference()->get('ROOMS.'.$this->getSlug().'.DISPLAY_SHORT', '');
 		if (empty($display_short)) {
-			return $this->getDisplay();
+			return $this->getDisplay(); // getDisplay() falls back to slug
 		}
 		else {
 			return $display_short;
-- 
cgit v1.2.3