Merge branch 'stable'

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index d97a8012cfffc4d10986c27d3f3a6f7bfa4019fd..c6bad6374b0f1074b6cd7d86ea37c9c857365754 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -341,9 +341,7 @@ void cgit_print_diff_ctrls()
        html("<td class='label'>mode:</td>");
        html("<td class='ctrl'>");
        html("<select name='ss' onchange='this.form.submit();'>");
        html("<td class='label'>mode:</td>");
        html("<td class='ctrl'>");
        html("<select name='ss' onchange='this.form.submit();'>");

-       curr = ctx.qry.ssdiff;
-       if (!curr && ctx.cfg.ssdiff)
-               curr = 1;
+       curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;

        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);
        html("</select></td></tr>");
        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);
        html("</select></td></tr>");


@@ -395,8 +393,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                }
        }
 
                }
        }
 

-       if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-               use_ssdiff = 1;
+       use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;

 
        if (show_ctrls)
                cgit_print_diff_ctrls();
 
        if (show_ctrls)
                cgit_print_diff_ctrls();