Merge branch 'master' of https://github.com/designcreateplay/NodeBB

src/user.js

@@ -209,6 +209,11 @@ var bcrypt = require('bcryptjs'),
 					} else {
 						user.hasPassword = false;
 					}
+
+					if (user.picture === user.uploadedpicture) {
+						// Append relative url
+						user.picture = nconf.get('relative_path') + user.picture;
+					}
 				}
 			});