diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/actionmailer_patches.rb | 15 | ||||
-rw-r--r-- | lib/i18n_fixes.rb | 2 | ||||
-rw-r--r-- | lib/world_foi_websites.rb | 15 |
3 files changed, 15 insertions, 17 deletions
diff --git a/lib/actionmailer_patches.rb b/lib/actionmailer_patches.rb deleted file mode 100644 index 600d3c8cc..000000000 --- a/lib/actionmailer_patches.rb +++ /dev/null @@ -1,15 +0,0 @@ -# Monkey patch for CVE-2013-4389 -# derived from http://seclists.org/oss-sec/2013/q4/118 to fix -# a possible DoS vulnerability in the log subscriber component of -# Action Mailer. - -require 'action_mailer' -module ActionMailer - class LogSubscriber < ActiveSupport::LogSubscriber - def deliver(event) - recipients = Array.wrap(event.payload[:to]).join(', ') - info("\nSent mail to #{recipients} (#{event.duration.round(1)}ms)") - debug(event.payload[:mail]) - end - end -end diff --git a/lib/i18n_fixes.rb b/lib/i18n_fixes.rb index 9f0849e75..64c370477 100644 --- a/lib/i18n_fixes.rb +++ b/lib/i18n_fixes.rb @@ -35,7 +35,7 @@ def gettext_interpolate(string, values) pattern, key = $1, $1.to_sym if !values.include?(key) - raise I18n::MissingInterpolationArgument.new(pattern, string) + raise I18n::MissingInterpolationArgument.new(pattern, string, values) else v = values[key].to_s if safe && !v.html_safe? diff --git a/lib/world_foi_websites.rb b/lib/world_foi_websites.rb index c3f3655df..50976c897 100644 --- a/lib/world_foi_websites.rb +++ b/lib/world_foi_websites.rb @@ -53,7 +53,20 @@ class WorldFOIWebsites {:name => "Informace pro Vsechny", :country_name => "Česká republika", :country_iso_code => "CZ", - :url => "http://www.infoprovsechny.cz"} + :url => "http://www.infoprovsechny.cz"}, + {:name => "¿Qué Sabés?", + :country_name => "Uruguay", + :country_iso_code => "UY", + :url => "http://www.quesabes.org/"}, + {:name => "Nu Vă Supărați", + :country_name => "România", + :country_iso_code => "RO", + :url => "http://nuvasuparati.info/"}, + {:name => "Marsoum41", + :country_name => "تونس", + :country_iso_code => "TN", + :url => "http://www.marsoum41.org"} + ] return world_foi_websites end |