From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 30 May 2011 21:57:25 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/52fbcf2ffac0025128cc1d50681a7ccd859ef3f0?hp=-c

Merge branch 'stable'
---

52fbcf2ffac0025128cc1d50681a7ccd859ef3f0
diff --combined html.c
index 4a18a57,24a03a5..eb1c25d
--- a/html.c
+++ b/html.c
@@@ -138,7 -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 +148,8 @@@
  				html("&#x27;");
  			else if (c=='"')
  				html("&quot;");
+ 			else if (c=='&')
+ 				html("&amp;");
  			txt = t+1;
  		}
  		t++;
@@@ -213,14 -215,6 +215,14 @@@ void html_option(const char *value, con
  	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='");