Merge branch 'master' into feature/add-communities-page

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1cb848ea6ef09685407b622c3e83d4131fdfdb1c..73e4ef51d5ced1dca199062575554ac35308fa80 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -61,14 +61,7 @@ class SiteController < ApplicationController
       require_user
     end
 
-    if %w[potlatch potlatch2].include?(editor)
-      append_content_security_policy_directives(
-        :connect_src => %w[*],
-        :object_src => %w[*],
-        :plugin_types => %w[application/x-shockwave-flash],
-        :script_src => %w['unsafe-inline']
-      )
-    elsif %w[id].include?(editor)
+    if %w[id].include?(editor)
       append_content_security_policy_directives(
         :frame_src => %w[blob:]
       )
@@ -113,6 +106,11 @@ class SiteController < ApplicationController
     @locale = params[:about_locale] || I18n.locale
   end
 
+  def communities
+    @locale = params[:communities_locale] || I18n.locale
+    @local_chapters = Communities.local_chapters
+  end
+
   def export; end
 
   def offline; end