backport crash fix

NodeBB · May 9, 2017 · 291df36 · 291df36
1 parent 3b626f7
commit 291df36
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/flags.js b/src/flags.js
@@ -15,7 +15,7 @@ var utils = require('../public/src/utils');
 var _ = require('underscore');
 var S = require('string');
 
-var Flags = {};
+var Flags = module.exports;
 
 Flags.get = function (flagId, callback) {
 	async.waterfall([
@@ -26,6 +26,9 @@ Flags.get = function (flagId, callback) {
 			notes: async.apply(Flags.getNotes, flagId),
 		}),
 		function (data, next) {
+			if (!data.base) {
+				return callback();
+			}
 			// Second stage
 			async.parallel({
 				userObj: async.apply(user.getUserFields, data.base.uid, ['username', 'userslug', 'picture']),
@@ -682,5 +685,3 @@ Flags.notify = function (flagObj, uid, callback) {
 		break;
 	}
 };
-
-module.exports = Flags;