Modified: trunk/lib/conf.rb (2323 => 2324)
--- trunk/lib/conf.rb 2010-01-28 13:27:15 UTC (rev 2323)
+++ trunk/lib/conf.rb 2010-01-29 16:30:10 UTC (rev 2324)
@@ -139,17 +139,19 @@
@config = nil
- if @settings['virtual_hosts']
- @settings['virtual_hosts'].each do |name, settings|
+ if request.class != ActionController::TestRequest
+ if @settings['virtual_hosts']
+ @settings['virtual_hosts'].each do |name, settings|
- if settings['entry_point'] && request.referer && settings['entry_point']
- if request.referer == settings['entry_point']
- session["portal"] = name
+ if settings['entry_point'] && request.referer && settings['entry_point']
+ if request.referer == settings['entry_point']
+ session["portal"] = name
+ end
end
- end
- if settings['host'] && request.host == settings['host']
- @config = name
+ if settings['host'] && request.host == settings['host']
+ @config = name
+ end
end
end
end