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

src/postTools.js

@@ -90,9 +90,7 @@ var winston = require('winston'),
 
 									topics.setTopicField(tid, 'thumb', options.topic_thumb);
 
-									db.searchRemove('topic', tid, function() {
+									plugins.fireHook('action:topic.edit', tid);
-										db.searchIndex('topic', title, tid);
-									});
 								}
 
 								posts.getPostData(pid, function(err, postData) {

src/posts.js

@@ -92,10 +92,10 @@ var db = require('./database'),
 						return next(err);
 					}
 
-					postData.content = content;
-
 					plugins.fireHook('action:post.save', postData);
 
+					postData.content = content;
+
 					next(null, postData);
 				});
 			}

src/routes/api.js

@@ -393,15 +393,13 @@ var path = require('path'),
 					return res.redirect('/404');
 				}
 
-				var limit = 50;
-
 				function searchPosts(callback) {
 					Plugins.fireHook('filter:search.query', {
 						index: 'post',
-						query: req.params.terms
+						query: req.params.term
 					}, function(err, pids) {
 						if (err) {
-							return callback(err, null);
+							return callback(err);
 						}
 
 						posts.getPostSummaryByPids(pids, false, callback);
@@ -411,10 +409,10 @@ var path = require('path'),
 				function searchTopics(callback) {
 					Plugins.fireHook('filter:search.query', {
 						index: 'topic',
-						query: req.params.terms
+						query: req.params.term
 					}, function(err, tids) {
 						if (err) {
-							return callback(err, null);
+							return callback(err);
 						}
 
 						topics.getTopicsByTids(tids, 0, callback);