From 85492e38abebdee736b8a39778d7e7c845dccacb Mon Sep 17 00:00:00 2001
From: Karl Prieb <karlprieb@gmail.com>
Date: Wed, 10 May 2017 16:54:26 -0300
Subject: [PATCH] Fix color css variables compilation

---
 packages/rocketchat-lib/lib/settings.js    | 6 +++---
 packages/rocketchat-theme/server/server.js | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-lib/lib/settings.js b/packages/rocketchat-lib/lib/settings.js
index 9c14943dac63..ecdd2c87c4b3 100644
--- a/packages/rocketchat-lib/lib/settings.js
+++ b/packages/rocketchat-lib/lib/settings.js
@@ -63,9 +63,9 @@ RocketChat.settings = {
 		return _(actions).reduceRight(_.wrap, (err, success) => callback(err, success))();
 	},
 	load(key, value, initialLoad) {
-		['*', key].forEach(key => {
-			if (RocketChat.settings.callbacks[key]) {
-				RocketChat.settings.callbacks[key].forEach(callback => callback(key, value, initialLoad));
+		['*', key].forEach(item => {
+			if (RocketChat.settings.callbacks[item]) {
+				RocketChat.settings.callbacks[item].forEach(callback => callback(key, value, initialLoad));
 			}
 		});
 		Object.keys(RocketChat.settings.regexCallbacks).forEach(cbKey => {
diff --git a/packages/rocketchat-theme/server/server.js b/packages/rocketchat-theme/server/server.js
index 940e4a1fdddf..16b254185f6a 100644
--- a/packages/rocketchat-theme/server/server.js
+++ b/packages/rocketchat-theme/server/server.js
@@ -71,17 +71,16 @@ RocketChat.theme = new class {
 		this.compileDelayed = _.debounce(Meteor.bindEnvironment(this.compile.bind(this)), 100);
 		Meteor.startup(() => {
 			RocketChat.settings.onAfterInitialLoad(() => {
-				RocketChat.settings.get('*', Meteor.bindEnvironment((key, value) => {
+				RocketChat.settings.get(/^theme-./, Meteor.bindEnvironment((key, value) => {
 					if (key === 'theme-custom-css' && value != null) {
 						this.customCSS = value;
-					} else if (/^theme-.+/.test(key) === true) {
+					} else {
 						const name = key.replace(/^theme-[a-z]+-/, '');
 						if (this.variables[name] != null) {
 							this.variables[name].value = value;
 						}
-					} else {
-						return;
 					}
+
 					this.compileDelayed();
 				}));
 			});
@@ -89,7 +88,6 @@ RocketChat.theme = new class {
 	}
 
 	compile() {
-
 		let content = [this.getVariablesAsLess()];
 
 		content.push(...this.files.map((name) => Assets.getText(name)));