aboutsummaryrefslogtreecommitdiff
path: root/model
diff options
context:
space:
mode:
authorAndreas Hubel2019-03-13 15:43:11 +0100
committerAndreas Hubel2019-03-13 15:43:11 +0100
commita9e8f9c6f1f06f2955c5f1e5d26e59f6e5446f65 (patch)
tree47aa8fda5b3261871659a7af7e35e8fbd6c3b871 /model
parent8d92ebe9abcb520e6fef724ac47b7ee19587e705 (diff)
fix room name fallback
Diffstat (limited to 'model')
-rw-r--r--model/Room.php4
1 files changed, 2 insertions, 2 deletions
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;