summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2011-12-05 10:50:07 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2011-12-05 10:50:07 +0100
commit97c6a5d184b8e8c14689ddb99951ad4d71204002 (patch)
treece3c46e0b1be810181b93538d91a17b5937d13ca
parentf4fcce1fc35bc0f4d88462b4c9c29de8fedb7cdf (diff)
Change how script code is stored to the Script objects. The std::string code member is there for a reason you know...
-rw-r--r--server/src/macroparser.cc2
-rw-r--r--server/src/transactionhandler.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/server/src/macroparser.cc b/server/src/macroparser.cc
index d1604b2..7d3f367 100644
--- a/server/src/macroparser.cc
+++ b/server/src/macroparser.cc
@@ -114,7 +114,7 @@ void MacroParser::characterData(std::string &data)
if(state == SCRIPT) {
assert(current_script); // No script present!
- current_script->attributes["code"].append(data);
+ current_script->code.append(data);
}
}
diff --git a/server/src/transactionhandler.cc b/server/src/transactionhandler.cc
index 5203ee2..ef112ee 100644
--- a/server/src/transactionhandler.cc
+++ b/server/src/transactionhandler.cc
@@ -244,7 +244,7 @@ static std::string handleRequest(Request &request, Environment &env,
answer +="\n-- END INCLUDE: '"+spi->attributes["src"]+"'\n";
}
} else {
- answer += xml_encode(spi->attributes["code"]);
+ answer += xml_encode(spi->code);
}
answer += "</script>\n";
spi++;