summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordeva <deva>2010-02-26 10:58:02 +0000
committerdeva <deva>2010-02-26 10:58:02 +0000
commit45bcd95467ffc2fce3b246c9c26c9070e29ae86d (patch)
tree1d1fc710a0e9ba4b85f3eb7e77da2c7d5234af50
parent6391eee732d7516a30eb93cddea4cf190026da94 (diff)
Make xml escaped characters show up correclty in the client.
-rw-r--r--server/src/server.cc2
-rw-r--r--server/src/widgetgenerator.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/server/src/server.cc b/server/src/server.cc
index 9c653f8..727ac28 100644
--- a/server/src/server.cc
+++ b/server/src/server.cc
@@ -239,7 +239,7 @@ static std::string handleRequest(Transaction *transaction,
if(completed) {
answer += " <resume>";
- answer += db.getResume(transaction->cpr, macro, time(NULL) - Conf::db_max_ttl);
+ answer += xml_encode(db.getResume(transaction->cpr, macro, time(NULL) - Conf::db_max_ttl));
answer += "</resume>\n";
}
diff --git a/server/src/widgetgenerator.cc b/server/src/widgetgenerator.cc
index 1e60479..57be1f2 100644
--- a/server/src/widgetgenerator.cc
+++ b/server/src/widgetgenerator.cc
@@ -152,7 +152,7 @@ static std::string send_macro_widget(Macro &macro,
while(p != widget.attributes.end()) {
if(p->first != "tagname" && p->first != "map") {
if( ! (p->first == "name" && p->second == "") )
- result += " " + p->first + "=\"" + p->second + "\"";
+ result += " " + p->first + "=\"" + xml_encode(p->second) + "\"";
}
p++;
}