Merge branch 'stable'

[cgit.git] / html.c

diff --git a/html.c b/html.c
index a0f6db4b04bdca2215d0425f9f85ed70933d08ce..eb1c25db9b84665c2a23e3ab0a74930ffd81d458 100644 (file)
--- a/html.c
+++ b/html.c
@@ -138,7 +138,7 @@ void html_attr(const char *txt)
        const char *t = txt;
        while(t && *t){
                int c = *t;
-               if (c=='<' || c=='>' || c=='\'' || c=='\"') {
+               if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') {
                        html_raw(txt, t - txt);
                        if (c=='>')
                                html("&gt;");
@@ -148,6 +148,8 @@ void html_attr(const char *txt)
                                html("&#x27;");
                        else if (c=='"')
                                html("&quot;");
+                       else if (c=='&')
+                               html("&amp;");
                        txt = t+1;
                }
                t++;
@@ -213,6 +215,14 @@ void html_option(const char *value, const char *text, const char *selected_value
        html("</option>\n");
 }
 
+void html_intoption(int value, const char *text, int selected_value)
+{
+       htmlf("<option value='%d'%s>", value,
+             value == selected_value ? " selected='selected'" : "");
+       html_txt(text);
+       html("</option>");
+}
+
 void html_link_open(const char *url, const char *title, const char *class)
 {
        html("<a href='");