Merge pull request #2701 from riking/email-pr-ssl

Rename POP3 settings, fix multisite SSL state leak
2025-05-22 07:53:49 +08:00 · 2014-08-29 10:02:05 +10:00
parent 1bef22bbb9 9090df63ba
commit c07d76677d
6 changed files with 57 additions and 36 deletions
--- a/config/application.rb
+++ b/config/application.rb
@ -91,7 +91,7 @@ module Discourse
    # Configure sensitive parameters which will be filtered from the log file.
    config.filter_parameters += [
        :password,
-        :pop3s_polling_password,
+        :pop3_polling_password,
        :s3_secret_access_key,
        :twitter_consumer_secret,
        :facebook_app_secret,