Item14376: subwebs weren't being processed

foswiki · Apr 23, 2017 · b5a81d1 · b5a81d1
1 parent cbba288
commit b5a81d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/Foswiki/Contrib/DBIStoreContrib.pm b/lib/Foswiki/Contrib/DBIStoreContrib.pm
@@ -565,11 +565,10 @@ sub load {
     while ( $wit->hasNext() ) {
 
         my $w = ( $wo->web ? $wo->web . '/' : '' ) . $wit->next();
-        next unless !defined($wre) || $w =~ /^$wre$/;
 
         # Load subweb
         my $swo = Foswiki::Meta->load( $wo->session, $w );
-        load( $swo, $reload );
+        load( $swo, $wre, $tre, $reload );
     }
 
     # No topics at root level

diff --git a/lib/Foswiki/Contrib/DBIStoreContrib/Personality/TransactSQL.pm b/lib/Foswiki/Contrib/DBIStoreContrib/Personality/TransactSQL.pm
@@ -10,7 +10,7 @@ use Encode ();
 use DBI qw(:sql_types);
 
 use Foswiki::Contrib::DBIStoreContrib qw(NAME NUMBER STRING UNKNOWN
-  BOOLEAN SELECTOR VALUE TABLE PSEUDO_BOOL trace %TRACE expandIDs);
+  BOOLEAN SELECTOR VALUE TABLE PSEUDO_BOOL trace %TRACE expandIDs traceSQL);
 use Foswiki::Contrib::DBIStoreContrib::Personality ();
 our @ISA = ('Foswiki::Contrib::DBIStoreContrib::Personality');
 
@@ -103,7 +103,7 @@ sub sql {
 
     if ( $TRACE{sql} ) {
         my @c = caller;
-        $this->traceSQL( "$sql at $c[1]:$c[2]", @_ );
+        traceSQL( "$sql at $c[1]:$c[2]", @_ );
     }
 
     my $sth = $this->{dbh}->prepare($sql);