From 340fd303c804d8c0ed56cc03b817a9c22c2cfd46 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 28 Apr 2014 10:37:28 -0400
Subject: [PATCH] FIX: in multisite setup, links to the current forum are
whitelisted when looking for spam hosts
---
app/models/post.rb | 1 +
spec/models/post_spec.rb | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/post.rb b/app/models/post.rb
index 879e2c33d..3d2c766ce 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -167,6 +167,7 @@ class Post < ActiveRecord::Base
.reject{|h| !h.include?('.')}
hosts << GlobalSetting.hostname
+ hosts << RailsMultisite::ConnectionManagement.current_hostname
end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 7e41b913f..36d2984f8 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -798,8 +798,7 @@ describe Post do
describe "has_host_spam" do
it "correctly detects host spam" do
- post = Fabricate(:post, raw: "hello from my site http://www.somesite.com
- http://#{GlobalSetting.hostname} ")
+ post = Fabricate(:post, raw: "hello from my site http://www.somesite.com http://#{GlobalSetting.hostname} http://#{RailsMultisite::ConnectionManagement.current_hostname}")
post.total_hosts_usage.should == {"www.somesite.com" => 1}
post.acting_user.trust_level = 0