Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item14427: fix load when explicit subweb path given
  • Loading branch information
cdot committed Jul 6, 2017
1 parent 8208a4a commit 40e7938
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion data/System/DBIStoreContrib.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1497033049" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1499336104" format="1.1" version="1"}%
---+!! !DBIStoreContrib
<!--
* Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
Expand Down Expand Up @@ -456,6 +456,8 @@ Here's an overview of the important bits of the contrib:
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 2.2 (Jul 2017) | Fixed Foswikitask:Item14427 |
| 2.1 (Jun 2017) | Fixed Foswikitask:Item14419 |
| 2.0 (April 2017) | Unicode support for Foswiki 2.0 |
| 1.2 (18 Oct 2014) | Foswikitask:Item12992: Added UNIQUE constraints to schema Foswikitask:Item13056: fix fileattachment moves in plugin |
| 1.1 (12 Aug 2014) | Fixes for Foswikitask:Item12989 and Foswikitask:Item12990: |
Expand Down
6 changes: 3 additions & 3 deletions lib/Foswiki/Contrib/DBIStoreContrib.pm
Expand Up @@ -237,7 +237,7 @@ sub _fmt_trace {
# is a string.
sub trace {

my $s = join( '', map { ref($_) ? _fmt_trace($_) : $_ } @_ );
my $s = join( '', map { ref($_) ? _fmt_trace($_) : ( $_ // 'undef' ) } @_ );
if ( $TRACE{cli} ) {
print STDERR "$s\n";
}
Expand Down Expand Up @@ -560,7 +560,7 @@ sub load {
die "Base metatypes and topic tables missing; do you need to --reset?";
}

trace( "Web ", $wo->getPath ) if $TRACE{action};
# Recurse through all webs
my $wit = $wo->eachWeb();
while ( $wit->hasNext() ) {

Expand All @@ -573,7 +573,7 @@ sub load {
}

# No topics at root level
return unless ( $wo->web() );
return unless ( $wo->web() && ( !defined($wre) || $w =~ /^$wre$/ ) );

my $tit = $wo->eachTopic();
while ( $tit->hasNext() ) {
Expand Down

0 comments on commit 40e7938

Please sign in to comment.