Merge 16070:16110 from trunk.

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 58a009a3b81a4e2a98f844ebc5e784aa500d3cf3..2a826770d4144b2eafa680ebdd0f189f56de0b79 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,10 +1,15 @@
 class SiteController < ApplicationController
+  layout 'site',:except => [:key]
+
   before_filter :authorize_web
+  before_filter :set_locale
   before_filter :require_user, :only => [:edit]
 
-
-  def search
-    @tags = WayTag.find(:all, :conditions => ["match(v) against (?)", params[:query][:query].to_s] )
+  def export
+    render :action => 'index'
   end
 
+  def key
+    expires_in 7.days, :public => true
+  end
 end