Merge remote-tracking branch 'origin/3.19' into 3.19

2600hz · Feb 2, 2015 · 813009b · 813009b
2 parents 5da7e78 + 393fc6e
commit 813009b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/apps/auth/app.js b/apps/auth/app.js
@@ -31,6 +31,9 @@ define(function(require){
 
 			self.getWhitelabel(function(data) {
 				// Merge the whitelabel info to replace the hardcoded info
+				if(data && data.hasOwnProperty('company_name')) {
+					data.companyName = data.company_name;
+				}
 				monster.config.whitelabel = $.extend(true, {}, monster.config.whitelabel, data);
 
 				if(!$.cookie('monster-auth')) {