Permalink
Browse files

Gilbert Roulot patches applied:

 * ErlyDTL template docroot provided for e_cache_ets
 * wpart_password UTF-8 problems fixed
  • Loading branch information...
1 parent af7705c commit 2a26f9b0cbbe92b84f39bc1785672228777e6e71 Michal Ptaszek committed Feb 19, 2010
Showing with 10 additions and 2 deletions.
  1. +1 −0 lib/eptic-1.4/src/e_annotation.erl
  2. +1 −1 lib/eptic-1.4/src/e_cache_ets.erl
  3. +8 −1 lib/wparts-1.4/src/wtype_password.erl
View
1 lib/eptic-1.4/src/e_annotation.erl
@@ -83,3 +83,4 @@ save_annotations(Hrl, []) ->
-spec(generate_define_name/1 :: (atom()) -> (string())).
generate_define_name(FunName) ->
string:to_upper(atom_to_list(FunName)).
+
View
2 lib/eptic-1.4/src/e_cache_ets.erl
@@ -93,7 +93,7 @@ cache(File, wpart_xs) ->
XML;
cache(File, erlydtl_expander) ->
Mod = list_to_atom(string:join(string:tokens(File, "/.-"), "")),
- case erlydtl:compile(File, Mod) of
+ case erlydtl:compile(File, Mod, [{doc_root, e_conf:template_root()}]) of
ok ->
ets:insert(?MODULE, {File, {date(), time()}, Mod}),
Mod;
View
9 lib/wparts-1.4/src/wtype_password.erl
@@ -45,8 +45,15 @@ validate({Types, undefined}) ->
end
end;
+validate({Types, [RawString1, RawString2]})
+ when is_list(RawString1) and is_list(RawString2) ->
+ validate2({Types, [utf8_api:ustring(RawString1),
+ utf8_api:ustring(RawString2)]});
+
validate({Types, RawString}) when is_list(RawString) ->
- String = utf8_api:ustring(RawString),
+ validate2({Types, utf8_api:ustring(RawString)}).
+
+validate2({Types, String}) when is_list(String) ->
case wpart_valid:is_private(Types) of
true ->
{ok, String};

0 comments on commit 2a26f9b

Please sign in to comment.