diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-08-21 21:35:10 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-08-21 21:35:10 +0100 |
commit | b832e9a1cd1c8669898b4d93fc1cd7199849979a (patch) | |
tree | 93316d0ffb998b4c2866f0c2492bad2079f90aa9 /lib/sisu/v0/sysenv.rb | |
parent | Updated sisu-0.56.3 (diff) | |
parent | small fixes to manifest and html_scroll, and adjustment to html navigation ba... (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/sysenv.rb')
-rw-r--r-- | lib/sisu/v0/sysenv.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 10ec5e33..9052ac91 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -1275,7 +1275,8 @@ module SiSU_Env end def root if defined? @rc['webserv']['url_root'] and @rc['webserv']['url_root'] =~/http:\/\//; "#{@rc['webserv']['url_root']}/#@stub_pwd" - else "http://localhost/#@stub_pwd" + elsif defined? @rc['webserv']['url_root'] and @rc['webserv']['url_root'] =~/localhost/; "http://localhost/#@stub_pwd" + else "file://#{path.output}" end end def remote |