* replaced :controller => '' broken statements by :controller => 'welcome'

* request_uri method no more used

git-svn-id: http://redmine.rubyforge.org/svn/trunk@175 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 12 insertions, 12 deletions

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c3b0ebd7f..9cca8d2c7 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -52,14 +52,14 @@ class AccountController < ApplicationController
   # Log out current user and redirect to welcome page

   def logout

     self.logged_in_user = nil

-    redirect_to :controller => ''

+    redirect_to :controller => 'welcome'

   end

   

   # Enable user to choose a new password

   def lost_password

     if params[:token]

       @token = Token.find_by_action_and_value("recovery", params[:token])

-      redirect_to :controller => '' and return unless @token and !@token.expired?

+      redirect_to :controller => 'welcome' and return unless @token and !@token.expired?

       @user = @token.user

       if request.post?

         @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]

@@ -95,12 +95,12 @@ class AccountController < ApplicationController
   

   # User self-registration

   def register

-    redirect_to :controller => '' and return unless Setting.self_registration?

+    redirect_to :controller => 'welcome' and return unless Setting.self_registration?

     if params[:token]

       token = Token.find_by_action_and_value("register", params[:token])

-      redirect_to :controller => '' and return unless token and !token.expired?

+      redirect_to :controller => 'welcome' and return unless token and !token.expired?

       user = token.user

-      redirect_to :controller => '' and return unless user.status == User::STATUS_REGISTERED

+      redirect_to :controller => 'welcome' and return unless user.status == User::STATUS_REGISTERED

       user.status = User::STATUS_ACTIVE

       if user.save

         token.destroy

@@ -125,7 +125,7 @@ class AccountController < ApplicationController
           Mailer.set_language_if_valid(@user.language)

           Mailer.deliver_register(token)

           flash[:notice] = l(:notice_account_register_done)

-          redirect_to :controller => ''

+          redirect_to :controller => 'welcome' and return

         end

       end

     end

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index bae05ce1b..2d2c31897 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -92,16 +92,16 @@ class ApplicationController < ActionController::Base
   # store current uri in session.
   # return to this location by calling redirect_back_or_default
   def store_location
-    session[:return_to] = request.request_uri
+    session[:return_to_params] = params
   end
 
   # move to the last store_location call or to the passed default one
   def redirect_back_or_default(default)
-    if session[:return_to].nil?
+    if session[:return_to_params].nil?
       redirect_to default
     else
-      redirect_to_url session[:return_to]
-      session[:return_to] = nil
+      redirect_to session[:return_to_params]
+      session[:return_to_params] = nil
     end
   end

   

diff --git a/app/views/feeds/news.rxml b/app/views/feeds/news.rxml
index 67c358d8d..8c7a855b8 100644
--- a/app/views/feeds/news.rxml
+++ b/app/views/feeds/news.rxml
@@ -2,7 +2,7 @@ xml.instruct!
 xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do

   xml.channel do

     xml.title "#{Setting.app_title}: #{l(:label_news_latest)}"

-    xml.link url_for(:controller => '', :only_path => false)

+    xml.link url_for(:controller => 'welcome', :only_path => false)

     xml.pubDate CGI.rfc1123_date(@news.first.created_on)

     xml.description l(:label_news_latest)

     @news.each do |news|

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index d54f1116f..bdecb0b96 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -33,7 +33,7 @@
 	

 	<div id="navigation">

 		<ul>

-	<li><%= link_to l(:label_home), { :controller => '' }, :class => "icon icon-home" %></li>

+	<li><%= link_to l(:label_home), { :controller => 'welcome' }, :class => "icon icon-home" %></li>

 	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>

 	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>