diff --git a/app/models/post.rb b/app/models/post.rb
index d658dbb4c..9ca8c4a0e 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -163,9 +163,9 @@ class Post < ActiveRecord::Base
hosts = SiteSetting
.white_listed_spam_host_domains
- .split(",")
+ .split('|')
.map{|h| h.strip}
- .reject{|h| !h.include?(".")}
+ .reject{|h| !h.include?('.')}
hosts << GlobalSetting.hostname
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 3d4886c32..2b5a841fb 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -742,7 +742,7 @@ cs:
tos_url: "Pokud máte dokument 'Podmínky Používání' hostovaný samostatně, napište sem jeho plnou URL."
privacy_policy_url: "Pokud máte dokument 'Ochrana Soukromí' hostovaný samostatně, napište sem jeho plnou URL."
newuser_spam_host_threshold: "Kolikrát smí uživatel zaslat odkaz na stejný server v rámci příspěvků z nastavení 'newuser_spam_host_posts', než budou příspěvky považovány za spam."
- white_listed_spam_host_domains: A comma delimited list of domains excluded from spam host testing, new users will be able to create an unrestricted count of posts with links to this domain
+ white_listed_spam_host_domains: A pipe-delimited list of domains excluded from spam host testing, new users will be able to create an unrestricted count of posts with links to this domain
staff_like_weight: "Extra hodnota pro 'líbí se' od uživatelů, kteří jsou součástí personálu webu."
reply_by_email_enabled: Jestli toto fórum umožňuje odpovědi emailem
reply_by_email_address: 'Šablona emailé adresy pro odpověď emailem, např. %{reply_key}@reply.myforum.com'
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index fd985bdef..420c3162a 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -606,7 +606,7 @@ en:
max_image_height: "Maximum allowed height of images in a post"
category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update."
add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains) changing this requires you update all your baked markdown with: \"rake posts:rebake\""
- exclude_rel_nofollow_domains: "A comma delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)"
+ exclude_rel_nofollow_domains: "A pipe-delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)"
post_excerpt_maxlength: "Maximum length in chars of a post's excerpt"
post_onebox_maxlength: "Maximum length of a oneboxed Discourse post"
@@ -809,7 +809,7 @@ en:
newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_posts` posts before being considered spam."
- white_listed_spam_host_domains: "A comma delimited list of domains excluded from spam host testing, new users will be able to create an unrestricted count of posts with links to this domain"
+ white_listed_spam_host_domains: "A pipe-delimited list of domains excluded from spam host testing, new users will be able to create an unrestricted count of posts with links to this domain"
staff_like_weight: "Extra weighting factor given to likes when performed by staff."
reply_by_email_enabled: "Enable replying to topics via email"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index ba8f9669d..caa592d39 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -313,7 +313,7 @@ id:
max_image_width: "Maximum allowed width of images in a post"
category_featured_topics: "Number of topics displayed per category in the /categories page"
add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains) changing this requires you update all your baked markdown"
- exclude_rel_nofollow_domains: "A comma delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)"
+ exclude_rel_nofollow_domains: "A pipe-delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)"
post_excerpt_maxlength: "Maximum length in chars of a post's excerpt"
post_onebox_maxlength: "Maximum length of a oneboxed Discourse post"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index ea71fd3a0..b7ac32977 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -509,7 +509,7 @@ ko:
max_image_height: "게시글에서 허용하는 이미지 최대 높이"
category_featured_topics: "Number of topics displayed per category in the /categories page"
add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains) changing this requires you update all your baked markdown"
- exclude_rel_nofollow_domains: "A comma delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)"
+ exclude_rel_nofollow_domains: "A pipe-delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)"
post_excerpt_maxlength: "Maximum length in chars of a post's excerpt"
post_onebox_maxlength: "Maximum length of a oneboxed Discourse post"
diff --git a/db/migrate/20140407202158_site_setting_comma_to_pipe.rb b/db/migrate/20140407202158_site_setting_comma_to_pipe.rb
new file mode 100644
index 000000000..86fe7d4b6
--- /dev/null
+++ b/db/migrate/20140407202158_site_setting_comma_to_pipe.rb
@@ -0,0 +1,31 @@
+class SiteSettingCommaToPipe < ActiveRecord::Migration
+ def up
+ execute <<SQL
+ UPDATE site_settings
+ SET value = replace(value, ',', '|')
+ WHERE name = 'white_listed_spam_host_domains'
+ ;
+SQL
+ execute <<SQL
+ UPDATE site_settings
+ SET value = replace(value, ',', '|')
+ WHERE name = 'exclude_rel_nofollow_domains'
+ ;
+SQL
+ end
+
+ def down
+ execute <<SQL
+ UPDATE site_settings
+ SET value = replace(value, '|', ',')
+ WHERE name = 'white_listed_spam_host_domains'
+ ;
+SQL
+ execute <<SQL
+ UPDATE site_settings
+ SET value = replace(value, '|', ',')
+ WHERE name = 'exclude_rel_nofollow_domains'
+ ;
+SQL
+ end
+end
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 7f9248d26..832f7def6 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -175,7 +175,7 @@ module PrettyText
whitelist = []
domains = SiteSetting.exclude_rel_nofollow_domains
- whitelist = domains.split(",") if domains.present?
+ whitelist = domains.split('|') if domains.present?
site_uri = nil
doc = Nokogiri::HTML.fragment(html)
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index e5e4fbe28..1e14ca93b 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -45,7 +45,7 @@ describe PrettyText do
describe "rel nofollow" do
before do
SiteSetting.stubs(:add_rel_nofollow_to_user_content).returns(true)
- SiteSetting.stubs(:exclude_rel_nofollow_domains).returns("foo.com,bar.com")
+ SiteSetting.stubs(:exclude_rel_nofollow_domains).returns("foo.com|bar.com")
end
it "should inject nofollow in all user provided links" do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 9f011f4da..7e41b913f 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -810,7 +810,7 @@ describe Post do
post.has_host_spam?.should == true
- SiteSetting.stubs(:white_listed_spam_host_domains).returns("bla.com,boo.com , somesite.com ")
+ SiteSetting.stubs(:white_listed_spam_host_domains).returns("bla.com|boo.com | somesite.com ")
post.has_host_spam?.should == false
end
end