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

public/src/forum/reset.js

@@ -7,7 +7,7 @@ define(function() {
 			successEl = $('#success'),
 			errorTextEl = errorEl.find('p');
 
-		$('#reset').onclick = function() {
+		$('#reset').on('click', function() {
 			if (inputEl.val() && inputEl.val().indexOf('@') !== -1) {
 				socket.emit('user.reset.send', {
 					email: inputEl.val()

src/categories.js

@@ -104,12 +104,13 @@ var db = require('./database'),
 					});
 				}
 
-				var indices = {};
-				for(var i=0; i<tids.length; ++i) {
+				var indices = {},
+					i = 0;
+				for(i=0; i<tids.length; ++i) {
 					indices[tids[i]] = start + i;
 				}
 
-				for(var i=0; i<topics.length; ++i) {
+				for(i=0; i<topics.length; ++i) {
 					topics[i].index = indices[topics[i].tid];
 				}