Browse Source

Merge remote-tracking branch 'origin/master'

Andreas Stenius 8 years ago
parent
commit
0ba4eb558a
2 changed files with 3 additions and 3 deletions
  1. 1 1
      rebar.config
  2. 2 2
      src/erlydtl_filters.erl

+ 1 - 1
rebar.config

@@ -2,7 +2,7 @@
 
 
 %% accept R15B02.., any R16B except R16B03
 %% accept R15B02.., any R16B except R16B03
 %% also accept OTP v17, altough it may not work properly on that release yet..
 %% also accept OTP v17, altough it may not work properly on that release yet..
-{require_otp_vsn, "R15B0[^1]|R16B$|R16B[^0]|R16B0[^3]|R16B03-1|17|18"}.
+{require_otp_vsn, "R15B0[^1]|R16B$|R16B[^0]|R16B0[^3]|R16B03-1|17|18|19"}.
 
 
 {erl_opts, [debug_info]}.
 {erl_opts, [debug_info]}.
 {yrl_opts, [{includefile, "include/erlydtl_preparser.hrl"}]}.
 {yrl_opts, [{includefile, "include/erlydtl_preparser.hrl"}]}.

+ 2 - 2
src/erlydtl_filters.erl

@@ -986,8 +986,8 @@ iriencode([C | Rest], Acc) ->
     iriencode(Rest, [hexdigit(Lo), hexdigit(Hi), $\% | Acc]).
     iriencode(Rest, [hexdigit(Lo), hexdigit(Hi), $\% | Acc]).
 
 
 join_io([], _Sep) -> [];
 join_io([], _Sep) -> [];
-join_io([_] = X, _Sep) -> X;
-join_io([X|T], Sep) -> [X,Sep] ++ join_io(T, Sep).
+join_io([X], _Sep) -> [format_number(X)];
+join_io([X|T], Sep) -> [format_number(X),Sep] ++ join_io(T, Sep).
 
 
 linebreaksbr(Input, Index) when is_binary(Input) ->
 linebreaksbr(Input, Index) when is_binary(Input) ->
     Break = <<"<br />">>,
     Break = <<"<br />">>,