Skip to content

Commit

Permalink
Item12285: Unit tests failures
Browse files Browse the repository at this point in the history
Need to not cache the Locale::Maketext version test.

git-svn-id: http://svn.foswiki.org/trunk@16248 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Dec 21, 2012
1 parent 39e47fc commit f7c4965
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions core/lib/Foswiki/Macros/MAKETEXT.pm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ use strict;
use warnings;

use Locale::Maketext;
my $escape =
( $Foswiki::cfg{UserInterfaceInternationalisation}
&& $Locale::Maketext::VERSION
&& $Locale::Maketext::VERSION < 1.23 );

sub MAKETEXT {
my ( $this, $params ) = @_;
Expand Down Expand Up @@ -38,7 +34,10 @@ s/~\[(\*,\_(\d+),[^,]+(,([^,]+))?)~\]/ _validate($1, $2, $max, $min, $param_erro
my $argsStr = $params->{args} || "";

# Escape any escapes.
$str =~ s#\\#\\\\#g if ($escape); # escape any escapes
$str =~ s#\\#\\\\#g
if ( $Foswiki::cfg{UserInterfaceInternationalisation}
&& $Locale::Maketext::VERSION
&& $Locale::Maketext::VERSION < 1.23 ); # escape any escapes

my @args = split( /\s*,\s*/, $argsStr );

Expand Down

0 comments on commit f7c4965

Please sign in to comment.