From 83a88c716a3577de0667f49cce77699790eb3686 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 6 Feb 2013 21:21:41 -0500 Subject: v4: sysenv, webserv dir (output dir), ensure is determined from base markup dir * where relative path provided (remove possibility of path expansion being done from a language sub-directory), fix --- lib/sisu/v4/sysenv.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/sisu/v4/sysenv.rb') diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index 2ac8897f..728f4fc4 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -1941,7 +1941,11 @@ WOK man_path=if @@man_path.nil? man_path=if defined? @rc['webserv']['path'] \ and @rc['webserv']['path'] =~/\S\S+/ + pwd=Dir.pwd + Dir.chdir(SiSU_Utils::Path.new.base_markup) man_path=@@man_path=File.expand_path(@rc['webserv']['path']) + Dir.chdir(pwd) + man_path else defaults[:webserv_path] end else @@man_path -- cgit v1.2.3