Fixed logout url to be a full url

cykod · Apr 9, 2010 · 56236fe · 56236fe
1 parent 71ab288
commit 56236fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/controllers/editor/auth_feature.rb b/app/controllers/editor/auth_feature.rb
@@ -341,7 +341,7 @@ def login_feature(data)
         if editor?
           { :href => 'javascript:void(0);' }
         else
-          { :href => '?cms_logout=1' }
+          { :href => data[:logout_url] }
         end
       end
 

diff --git a/app/controllers/editor/auth_renderer.rb b/app/controllers/editor/auth_renderer.rb
@@ -186,7 +186,7 @@ def user_register
     @options.register_features.each do |feature|
       feature.feature_instance.feature_data(@feature)
     end
-    
+
     render_paragraph :feature => :user_register
   end
 
@@ -314,6 +314,8 @@ def login
 
     data[:login_user] = myself
     data[:options] = opts
+    data[:current_page] = paragraph_page_url
+    data[:logout_url] = "#{data[:current_page]}?cms_logout=1"
 
     if params[:cms_logout]
       opts.login_features.each do |feature|