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

public/src/modules/composer.js

@@ -434,21 +434,25 @@ define(['taskbar'], function(taskbar) {
 				'title' : titleEl.val(),
 				'content' : bodyEl.val(),
 				'category_id' : postData.cid
+			}, function() {
+				composer.discard(post_uuid);
 			});
 		} else if (parseInt(postData.tid) > 0) {
 			socket.emit('api:posts.reply', {
 				'topic_id' : postData.tid,
 				'content' : bodyEl.val()
+			}, function() {
+				composer.discard(post_uuid);
 			});
 		} else if (parseInt(postData.pid) > 0) {
 			socket.emit('api:posts.edit', {
 				pid: postData.pid,
 				content: bodyEl.val(),
 				title: titleEl.val()
+			}, function() {
+				composer.discard(post_uuid);
 			});
 		}
-
-		composer.discard(post_uuid);
 	}
 
 	function composerAlert(title, message) {

public/templates/header.tpl

@@ -154,9 +154,11 @@
 								</div>
 								<button type="submit" class="btn btn-default hide">[[global:search]]</button>
 							</div>
-							<button id="search-button" type="button" class="btn btn-link hide"><i class="fa fa-search"></i></button>
 						</form>
 					</li>
+					<li>
+						<a id="search-button" class="hide"><i class="fa fa-search"></i></a>
+					</li>
 				</ul>
 
 				<ul class="nav navbar-nav navbar-right pagination-block">