Merge branch 'refactoring' of git://github.com/mattvanhorn/discourse

Conflicts: lib/text_sentinel.rb
2025-05-29 01:31:35 +08:00 · 2013-05-27 10:42:20 -04:00
parent a15910ad1e d5958f8779
commit e1781240a6
11 changed files with 146 additions and 74 deletions
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@ -203,7 +203,7 @@ class TopicsController < ApplicationController
    @topic = Topic.where(id: params[:topic_id].to_i).first
    guardian.ensure_can_see!(@topic)

-    @topic.toggle_mute(current_user, v)
+    @topic.toggle_mute(current_user)
    render nothing: true
  end