Skip to content

Commit

Permalink
core: the medium size is actually called 'middle' (for 0.x)
Browse files Browse the repository at this point in the history
  • Loading branch information
mworrell committed Mar 2, 2017
1 parent 0c6d85a commit 26e3b0f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions modules/mod_base/filters/filter_show_media.erl
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ filter_args([], true, Acc, _Context) ->
Acc;
filter_args([], false, Acc, Context) ->
[_S,M,_L] = get_sizes(Context),
[{size, M}, {sizename, <<"medium">>}|Acc];
[{size, M}, {sizename, <<"middle">>}|Acc];
filter_args([{size,Size}|Args], _, Acc, Context) ->
[S,M,L] = get_sizes(Context),
{P,SizeName} = case Size of
<<"large">> -> {L,<<"large">>};
<<"small">> -> {S,<<"small">>};
_ -> {M,<<"medium">>}
_ -> {M,<<"middle">>}
end,
filter_args(Args, true, [{size,P},{sizename,SizeName}|Acc], Context);
filter_args([{crop, <<"crop">>}|Args], HasSize, Acc, Context) ->
Expand Down
2 changes: 1 addition & 1 deletion src/support/z_sanitize.erl
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ sanitize_z_media_arg({<<"id">>, Id}) when is_binary(Id) -> {<<"id">>, z_string:t
sanitize_z_media_arg({<<"id">>, Id}) when is_integer(Id) -> {<<"id">>, Id};
sanitize_z_media_arg({<<"size">>, <<"large">>} = S) -> S;
sanitize_z_media_arg({<<"size">>, <<"small">>} = S) -> S;
sanitize_z_media_arg({<<"size">>, _}) -> {<<"size">>, <<"medium">>};
sanitize_z_media_arg({<<"size">>, _}) -> {<<"size">>, <<"middle">>};
sanitize_z_media_arg({<<"align">>, <<"left">>} = S) -> S;
sanitize_z_media_arg({<<"align">>, <<"right">>} = S) -> S;
sanitize_z_media_arg({<<"align">>, _}) -> {<<"align">>, <<"block">>};
Expand Down

0 comments on commit 26e3b0f

Please sign in to comment.