[interchange-cvs] [SCM] Interchange branch, master, updated. 45471c43eacbf641c205a3abdd5f787d8b499347

[Jon Jensen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  45471c43eacbf641c205a3abdd5f787d8b499347 (commit)
      from  9b6872cabea98440451efac8565f4050350116ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 45471c43eacbf641c205a3abdd5f787d8b499347
Author: Jon Jensen <jon at endpoint.com>
Date:   Tue Sep 8 09:15:14 2009 -0600

    Fix bug that didn't tolerate relative TemplateDir settings

-----------------------------------------------------------------------

Summary of changes and diff:
 lib/Vend/Config.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/Vend/Config.pm b/lib/Vend/Config.pm
index 744423d..1be545b 100644
--- a/lib/Vend/Config.pm
+++ b/lib/Vend/Config.pm
@@ -3582,8 +3582,9 @@ sub set_default_search {
 			my $cat_template_dirs = $C->{TemplateDir} || [];
 			if ($Global::NoAbsolute) {
 				for (@$cat_template_dirs) {
-					absolute_or_relative($_) and
+					if (absolute_or_relative($_) and ! /^$C->{VendRoot}/) {
 						config_error("TemplateDir path %s is prohibited by NoAbsolute", $_);
+					}
 				}
 			}
 			my @paths = map { quotemeta $_ }


hooks/post-receive
-- 
Interchange