Merge remote-tracking branch 'upstream/pull/5518'

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 5d63e79fd3937fc178791920477b3668129e92ce..9adbaa1953fd9fe774bf9bb90eb130da53aed90e 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -24,7 +24,7 @@ class SiteController < ApplicationController
   end
 
   def index
   end
 
   def index

-    session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless Settings.status == "database_readonly" || Settings.status == "database_offline"
+    session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless %w[database_readonly database_offline].include?(Settings.status)

   end
 
   def permalink
   end
 
   def permalink


@@ -138,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