diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-06-09 23:14:19 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-06-09 23:14:19 -0400 |
| commit | d913451de6a39c7777a1ad7c00488324ac0357ff (patch) | |
| tree | 1da43411c0aa2a686d94829544d9f271da5a8c69 /lib/sisu/v3/sysenv.rb | |
| parent | debian/changelog (3.0.11-1) (diff) | |
| parent | v3: cgi, sample search form, force utf-8 character encoding to avoid issues (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/sysenv.rb')
| -rw-r--r-- | lib/sisu/v3/sysenv.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 944df010..d0c88deb 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -1642,7 +1642,10 @@ WOK "#{path.webserv}/#{images}" end def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names - "#{path.webserv}/#{@stub_pwd}" + r=Px[:lng_lst].join('|') + u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/ + base_stub=@sys.pwd.gsub(u,'\1') + "#{path.webserv}/#{base_stub}" end def feed (defined? @rc['webserv']['feed']) \ |