Merge branch 'feature/25-default-schedule-names-to-display-name'

fixes voc#25
Fenrirthviti · Dec 18, 2016 · efd0b59 · efd0b59
2 parents 340fdec + 1e6353b
commit efd0b59
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/model/Room.php b/model/Room.php
@@ -40,7 +40,7 @@ public function getStream() {
 	}
 
 	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() {