From 4b3f09deea70fe9bb59afaee109cda5932bb6c26 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 8 Feb 2016 12:21:23 +0200
Subject: [PATCH] closes #4154

---
 src/categories/data.js              |  2 +-
 src/controllers/accounts/helpers.js | 12 ++++++------
 src/user/data.js                    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/categories/data.js b/src/categories/data.js
index 5cfdb091b2..fb166a47af 100644
--- a/src/categories/data.js
+++ b/src/categories/data.js
@@ -42,7 +42,7 @@ module.exports = function(Categories) {
 			return;
 		}
 
-		category.name = validator.escape(category.name);
+		category.name = validator.escape(category.name || '');
 		category.disabled = category.hasOwnProperty('disabled') ? parseInt(category.disabled, 10) === 1 : undefined;
 		category.icon = category.icon || 'hidden';
 		if (category.hasOwnProperty('post_count')) {
diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index f7a0fca24d..631230b5bd 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -92,17 +92,17 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
 			userData.sso = results.sso.associations;
 			userData.status = user.getStatus(userData);
 			userData.banned = parseInt(userData.banned, 10) === 1;
-			userData.website = validator.escape(userData.website);
+			userData.website = validator.escape(userData.website || '');
 			userData.websiteLink = !userData.website.startsWith('http') ? 'http://' + userData.website : userData.website;
 			userData.websiteName = userData.website.replace(validator.escape('http://'), '').replace(validator.escape('https://'), '');
 			userData.followingCount = parseInt(userData.followingCount, 10) || 0;
 			userData.followerCount = parseInt(userData.followerCount, 10) || 0;
 
-			userData.username = validator.escape(userData.username);
-			userData.email = validator.escape(userData.email);
-			userData.fullname = validator.escape(userData.fullname);
-			userData.location = validator.escape(userData.location);
-			userData.signature = validator.escape(userData.signature);
+			userData.username = validator.escape(userData.username || '');
+			userData.email = validator.escape(userData.email || '');
+			userData.fullname = validator.escape(userData.fullname || '');
+			userData.location = validator.escape(userData.location || '');
+			userData.signature = validator.escape(userData.signature || '');
 			userData.aboutme = validator.escape(userData.aboutme || '');
 
 			userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid);
diff --git a/src/user/data.js b/src/user/data.js
index 36dfc79247..04c6d0e999 100644
--- a/src/user/data.js
+++ b/src/user/data.js
@@ -94,7 +94,7 @@ module.exports = function(User) {
 				return;
 			}
 
-			user.username = validator.escape(user.username);
+			user.username = validator.escape(user.username || '');
 
 			if (user.password) {
 				user.password = undefined;