diff options
| author | derchris | 2019-04-21 17:23:05 +0200 |
|---|---|---|
| committer | derchris | 2019-04-21 17:23:05 +0200 |
| commit | 34291fa240ea12d2b04ba5741d61b062a67d081f (patch) | |
| tree | 19dd2d2a19a03e8154a136af855a46aa13dea21c /model/Room.php | |
| parent | fd72b0f50a355006069c5a336441f08beb7d3c50 (diff) | |
| parent | 9e9e444e052b9cd887d8d5fbda51b40ad2eafcfa (diff) | |
Merge branch 'master' of git.c3voc.de:streaming-website
Diffstat (limited to 'model/Room.php')
| -rw-r--r-- | model/Room.php | 4 |
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; |