Chris/webperl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve reporting of odd tempalte behaviour

Browse Source
This commit is contained in:
Chris 2017-03-27 10:25:35 +01:00
parent 6182b9aec1
commit 22b2ef875a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Webperl/Template.pm
View File

@ -123,7 +123,7 @@ package Webperl::Template;
use experimental qw(smartmatch); use experimental qw(smartmatch);
use POSIX qw(strftime); use POSIX qw(strftime);
use Webperl::Utils qw(path_join superchomp); use Webperl::Utils qw(path_join superchomp);
use Carp qw(longmess); use Carp qw(longmess carp);
use HTML::WikiConverter; use HTML::WikiConverter;
use HTML::Entities; use HTML::Entities;
use v5.12; use v5.12;
@ -516,10 +516,16 @@ sub process_template {
my $varmap = shift; my $varmap = shift;
my $nocharfix = shift; my $nocharfix = shift;
carp("No text passed to process_template")
unless($text);
# If text is a reference already, we can just use it. Otherwise we need # If text is a reference already, we can just use it. Otherwise we need
# to make a reference to the text to simplify the code in the loop below. # to make a reference to the text to simplify the code in the loop below.
my $textref = ref($text) ? $text : \$text; my $textref = ref($text) ? $text : \$text;
carp("No text passed to process_template")
unless($$textref);
# replace all the keys in the text with the appropriate value. # replace all the keys in the text with the appropriate value.
my ($key, $value, $count); my ($key, $value, $count);
my $limit = 0; my $limit = 0;
@ -551,6 +557,9 @@ sub process_template {
# Convert horrible smart quote crap from windows # Convert horrible smart quote crap from windows
foreach my $char (keys(%$entities)) { foreach my $char (keys(%$entities)) {
carp("Error replacing entitiy: $char, no replacement.")
if(!$char || !$entities -> {$char});
$$textref =~ s/$char/$entities->{$char}/g; $$textref =~ s/$char/$entities->{$char}/g;
} }
} }