Merge branch 'core/RocketChat#8264-room-types' into feature/#19-decou…

…ple-help-requests
assistify · Sep 29, 2017 · b285961 · b285961
2 parents bfc8dfd + 9d2381e
commit b285961
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/packages/rocketchat-lib/client/lib/roomTypes.js b/packages/rocketchat-lib/client/lib/roomTypes.js
@@ -111,6 +111,9 @@ RocketChat.roomTypes = new class extends roomTypesCommon {
 		return this.roomTypes[roomType].notSubscribedTpl;
 	}
 	getCreationTemplate(roomType) {
+		if (this.roomTypes[roomType] && !this.roomTypes[roomType].creationTemplate) {
+			return false;
+		}
 		return this.roomTypes[roomType].creationTemplate;
 	}
 };