Merge branch 'pull/4985'

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index ad19df50e463bd1b292457a369534a2aa351b89e..58f0a11c9340bbd796082622f3d6dcdbe852d13d 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -18,7 +18,8 @@ class SiteController < ApplicationController
 
   content_security_policy(:only => :id) do |policy|
     policy.connect_src("*")
 
   content_security_policy(:only => :id) do |policy|
     policy.connect_src("*")

-    policy.img_src("*", :blob)
+    policy.img_src(*policy.img_src, "*", :blob)
+    policy.script_src(*policy.script_src, :unsafe_eval)

     policy.style_src(*policy.style_src, :unsafe_inline)
   end
 
     policy.style_src(*policy.style_src, :unsafe_inline)
   end
 


@@ -109,6 +110,7 @@ class SiteController < ApplicationController
   end
 
   def copyright
   end
 
   def copyright

+    @title = t ".title"

     @locale = params[:copyright_locale] || I18n.locale
   end
 
     @locale = params[:copyright_locale] || I18n.locale
   end
 


@@ -136,7 +138,12 @@ class SiteController < ApplicationController
   end
 
   def preview
   end
 
   def preview

-    render :html => RichText.new(params[:type], params[:text]).to_html
+    if params[:text].blank?
+      flash.now[:warning] = t("layouts.nothing_to_preview")
+      render :partial => "layouts/flash"
+    else
+      render :html => RichText.new(params[:type], params[:text]).to_html
+    end

   end
 
   def id
   end
 
   def id