@@ -72,15 +72,21 @@ protected def protect_controller_if_no_dashboard redirect_to clean_dashboard_url if dashboard_subdomain.nil? end + + def account_domain + account_domain = "" + account_domain << request.subdomains[1..-1].join(".") + "." if request.subdomains.size > 1 + account_domain << request.domain + request.port_string + end - def clean_dashboard_url(user=nil) + def clean_dashboard_url(permalink=nil) home_permalink = request.subdomains.empty? ? current_user.home.permalink : request.subdomains.first - home_permalink = (user.is_a?(User) ? user.home.permalink : user ) unless user.nil? # overwrite fu - "#{protocol}#{home_permalink}.#{request.host}#{request.port_string}" + home_permalink = permalink unless permalink.nil? # overwrite fu + "#{protocol}#{home_permalink}.#{account_domain}" end def clean_root_url - "#{protocol}#{request.domain}#{request.host}#{request.port_string}" + "#{protocol}#{account_domain}" end def protocol dashboard_location/lib/dashboard_location.rb 32543ff255fac310ecc75a76a9dbd8df862a4ad5 Zach Inglis zach@lt3media.com http://github.com/zachinglis/rails-plugins/commit/1cf0f32954830d17be93651852570da898d563b7 1cf0f32954830d17be93651852570da898d563b7 2008-03-04T12:45:10-08:00 2008-03-04T12:45:10-08:00 After some issues, I am reputting some of DHH's magic back into this. Need to work on tests, and yes, I know, I should have done them before the plugin :) cb1d37cab69efaeaa06460360d12315c6842693e Zach Inglis zach@lt3media.com