Item12129: fix include, and balanced parsing of curly braces at the s…

…ame time git-svn-id: http://svn.foswiki.org/trunk@17292 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 20, 2014 · 2246c99 · 2246c99
1 parent 7fcb8ec
commit 2246c99
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/lib/Foswiki/Tables/Reader.pm b/core/lib/Foswiki/Tables/Reader.pm
@@ -128,20 +128,20 @@ sub early_line {
     push( @{ $this->{waiting} }, $3 ) if defined($3) && length($3);
 
     my %read = ( $this->{meta}->getPath() => 1 );
+    my $session = $this->{meta}->session;
     while ( $attrs->{include} ) {
         my ( $iw, $it ) =
-          Foswiki::Func::normalizeWebTopicName( $this->{meta}->web,
+          $session->normalizeWebTopicName( $this->{meta}->web,
             $attrs->{include} );
-        if ( Foswiki::topicExists( $iw, $it ) ) {
+        if ( $session->topicExists( $iw, $it ) ) {
             if ( $read{"$iw.$it"} ) {
                 $line = CGI::span( { class => 'foswikiAlert' },
                     "Recursive include of $attrs->{include}" );
                 last;
             }
             else {
                 $read{"$iw.$it"} = 1;
-                my $meta =
-                  Foswiki::Meta->load( $this->{meta}->session, $iw, $it );
+                my $meta = Foswiki::Meta->load( $session, $iw, $it );
 
                # Replace attrs with the first matching macro in the include text
                # If there is none, we're done