From f207dd2bbc09b03d7e96f10161186d10e90dc4fe Mon Sep 17 00:00:00 2001 From: CrawfordCurrie Date: Wed, 7 Oct 2009 09:09:19 +0000 Subject: [PATCH] Item2217: fix recursive search git-svn-id: http://svn.foswiki.org/trunk@5223 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- core/lib/Foswiki/Search.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/lib/Foswiki/Search.pm b/core/lib/Foswiki/Search.pm index 047c16306b..13b8fea516 100644 --- a/core/lib/Foswiki/Search.pm +++ b/core/lib/Foswiki/Search.pm @@ -18,6 +18,7 @@ use Foswiki::Sandbox (); use Foswiki::Search::InfoCache (); use Foswiki::ListIterator (); use Foswiki::Iterator::FilterIterator (); +use Foswiki::WebFilter (); #TODO: move these into a more appropriate place - they are function objects so can persist for a _long_ time my $queryParser; @@ -204,7 +205,7 @@ sub _getListOfWebs { } my $it = $webObject->eachWeb(1); while ( $it->hasNext() ) { - my $w = $it->next(); + my $w = $web.'/'.$it->next(); next unless $Foswiki::WebFilter::user_allowed->ok( $session, $w ); @@ -227,7 +228,7 @@ sub _getListOfWebs { my $it = $webObject->eachWeb( $Foswiki::cfg{EnableHierarchicalWebs} ); while ( $it->hasNext() ) { - my $w = $it->next(); + my $w = $session->{webName}.'/'.$it->next(); next unless $Foswiki::WebFilter::user_allowed->ok( $session, $w ); push( @tmpWebs, $w );