Merge branch 'master' of github.com:synrc/nitro

src/nitro.erl

@@ -9,8 +9,8 @@ q(Key) -> Val = get(Key), q(Key,Val).
 q(Key,undefined) -> [];
 q(Key,Val) -> Val.
 
-qc(Key) -> CX = get(context), qc(Key,CX).
-qc(Key,Ctx) -> proplists:get_value(nitro:to_binary([Key]),Ctx#cx.params).
+qc(Key) -> CX = get(context), qc(Key,CX#cx.req).
+qc(Key,Req) -> proplists:get_value(nitro:to_binary(Key),cowboy_req:parse_qs(Req)).
 
 start(_StartType, _StartArgs) -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 stop(_State) -> ok.

src/render/wf_render_elements.erl

@@ -26,7 +26,7 @@ render_element(Element) when is_tuple(Element) ->
 render_element(Element) -> io:format("Unknown Element: ~p~n\r",[Element]).
 
 default_render(Tag, Record) ->
-    wf_tags:emit_tag(Tag, nitro:render(element(#element.body,Record)),
+    wf_tags:emit_tag(Tag, nitro:render(lists:flatten([element(#element.body,Record)])),
         lists:append([
            [{<<"id">>,              element(#element.id, Record)},
             {<<"class">>,           element(#element.class, Record)},