diff options
| author | MaZderMind | 2016-12-18 13:33:27 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-18 13:33:27 +0100 |
| commit | efd0b59f8ed363e12211894d8892e4d18b198c04 (patch) | |
| tree | 06a196ba299f4610124032418187348222cf9535 /model | |
| parent | 340fdecd903fedee4dc39cfc60c166122f2451e1 (diff) | |
| parent | 1e6353b9fa405d9c85833a77e329be88cac09fcc (diff) | |
Merge branch 'feature/25-default-schedule-names-to-display-name'
fixes #25
Diffstat (limited to 'model')
| -rw-r--r-- | model/Room.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/model/Room.php b/model/Room.php index aa72630..782c91d 100644 --- a/model/Room.php +++ b/model/Room.php @@ -40,7 +40,7 @@ class Room } public function getScheduleName() { - return $this->getConference()->get('ROOMS.'.$this->getSlug().'.SCHEDULE_NAME', $this->getSlug()); + return $this->getConference()->get('ROOMS.'.$this->getSlug().'.SCHEDULE_NAME', $this->getDisplay()); } public function getDisplay() { |