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

public/templates/accountedit.tpl

@@ -76,7 +76,7 @@
     $(document).ready(function(){
         
         $('#submitBtn').on('click',function(){
-            alert('click');    
+
             var userData = {
                 uid:$('#inputUID').val(),
                 email:$('#inputEmail').val(),
@@ -89,7 +89,7 @@
             $.post('/edituser',
                 userData,
                 function(data) {
-                         alert('fail');       
+
                 }                
             );
             

src/user.js

@@ -70,9 +70,14 @@ var	config = require('../config.js'),
 		});
 	}
 
-	User.updateUserFields = function(uid, data) {
+	User.updateProfile = function(uid, data) {
 		
-		for(var key in data) {
+		var fields = ['email', 'fullname', 'website', 'location', 'birthday'];
+		var key = '';
+		
+		for(var i=0,ii=fields.length; i<ii; ++i) {
+			key = fields[i];
+			if(data[key] !== undefined)
 				User.setUserField(uid, key, data[key]);
 		}
 	}

src/webserver.js

@@ -207,7 +207,7 @@ var express = require('express'),
 		if(req.user.uid != req.body.uid)
 			return res.redirect('/');
 		
-		user.updateUserFields(req.user.uid, req.body);
+		user.updateProfile(req.user.uid, req.body);
 		
 		res.redirect('/');
 	});