diff --git a/C4/TTParser.pm b/C4/TTParser.pm index 7007fb6604..269d868a77 100644 --- a/C4/TTParser.pm +++ b/C4/TTParser.pm @@ -73,6 +73,26 @@ sub text{ my $line = shift; my $work = shift; # original text my $is_cdata = shift; + # If there is a split template toolkit tag + if ( $work =~ m/^(?:(?!\[%).)*?%\]/s ) { + my @strings = ($&); + my $token; + $work = $'; + while ( $token = pop @tokens ) { + if ( $token->string =~ m/\[%.*?$/s ) { + push @tokens, C4::TmplToken->new( $`, $token->type, $token->line_number, $token->pathname ); + push @strings, $&; + last; + } else { + push @strings, $token->string; + } + } + push @tokens, + C4::TmplToken->new( + join( '', reverse @strings ), C4::TmplTokenType::DIRECTIVE, + $token ? $token->line_number : $line, $self->{filename} + ); + } while($work){ # if there is a template_toolkit tag if( $work =~ m/\[%.*?%\]/ ){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt index de301479f3..abc6272c1d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt @@ -43,7 +43,7 @@ [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ ' ' ~%] [%~ END ~%] [%~ IF can_delete_shelf ~%] @@ -54,7 +54,7 @@ [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ END ~%] [%~ IF public AND allow_transfer ~%] @@ -64,7 +64,7 @@ [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ END ~%] [%~ ELSE ~%]