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

public/src/ajaxify.js

@@ -118,6 +118,7 @@ var ajaxify = {};
 				app.processPage();
 
 				jQuery('#content, #footer').stop(true, true).removeClass('ajaxifying');
+				ajaxify.initialLoad = false;
 
 				if (window.location.hash) {
 					hash = window.location.hash;

public/src/templates.js

@@ -394,11 +394,11 @@
 				var regex = new RegExp("{" + namespace + "[\\s\\S]*?}", 'g');
 				template = template.replace(regex, '');
 				namespace = '';
+			} else {
+				// clean up all undefined conditionals
+				template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');	
 			}
 
-			// clean up all undefined conditionals
-			template = template.replace(/<!-- IF([^@]*?)ENDIF([^@]*?)-->/gi, '');
-
 			return template;
 
 		})(data, "", template);

src/user.js

@@ -490,13 +490,13 @@ var bcrypt = require('bcrypt'),
 
 	User.search = function(query, callback) {
 		if (!query || query.length === 0) {
-			return callback(null, {timing:0, users:[]});
+			return callback(null, []);
 		}
 		var start = process.hrtime();
 
 		db.getObject('username:uid', function(err, usernamesHash) {
 			if (err) {
-				return callback(null, {timing: 0, users:[]});
+				return callback(null, []);
 			}
 
 			query = query.toLowerCase();
@@ -516,9 +516,7 @@ var bcrypt = require('bcrypt'),
 			});
 
 			User.getDataForUsers(results, function(userdata) {
-				var diff = process.hrtime(start);
-				var timing = (diff[0] * 1e3 + diff[1] / 1e6).toFixed(1);
-				callback(null, {timing: timing, users: userdata});
+				callback(null, userdata);
 			});
 		});
 	};