Merge remote-tracking branch 'origin/master'

Conflicts:
	public/src/client/topic/postTools.js
v1.18.x
psychobunny 10 years ago
commit 8fbb085718

@ -126,7 +126,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
openChat($(this)); openChat($(this));
}); });
$('[component="topic/reply"]').on('click', function() { components.get('topic/reply').on('click', function() {
if (!threadState.locked) { if (!threadState.locked) {
onReplyClicked($(this), tid, topicName); onReplyClicked($(this), tid, topicName);
} }

Loading…
Cancel
Save