Merge pull request TryGhost#1882 from jgillich/fix

Fix TypeError due to missing mail config
georgicodes · Jan 7, 2014 · 371dc86 · 371dc86
2 parents 5a638ed + f8299ed
commit 371dc86
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/server/update-check.js b/core/server/update-check.js
@@ -69,7 +69,7 @@ function updateCheckData() {
     data.node_version    = process.versions.node;
     data.env             = process.env.NODE_ENV;
     data.database_type   = require('./models/base').client;
-    data.email_transport = mailConfig && mailConfig.options && mailConfig.options.service ? mailConfig.options.service : mailConfig.transport;
+    data.email_transport = mailConfig && (mailConfig.options && mailConfig.options.service ? mailConfig.options.service : mailConfig.transport);
 
     return when.settle(ops).then(function (descriptors) {
         var hash             = descriptors[0].value,
@@ -188,4 +188,4 @@ function updateCheck(res) {
     return deferred.promise;
 }
 
-module.exports = updateCheck;
+module.exports = updateCheck;