From cd50c6f535cdccb661cb93fde561c10ced3f069e Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 26 Feb 2010 11:35:01 +0000
Subject: Fix missing XML decoding in journal.

---
 server/src/journal_commit.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'server/src/journal_commit.cc')

diff --git a/server/src/journal_commit.cc b/server/src/journal_commit.cc
index 414fa20..a94f1d4 100644
--- a/server/src/journal_commit.cc
+++ b/server/src/journal_commit.cc
@@ -51,6 +51,7 @@
 
 #include "template.h"
 #include "templateparser.h"
+#include "xml_encode_decode.h"
 
 static inline bool iswhitespace(char c)
 {
@@ -184,13 +185,13 @@ int journal_commit(const char *cpr, const char *user,
   mwrite(sock, "charset: utf8\r\n");
   mwrite(sock, "\r\n");
 
-  std::string resume = stripTrailingWhitepace(addNewlines(buf, 60));
+  std::string resume = buf;//stripTrailingWhitepace(addNewlines(buf, 60));
 
   // send body
   if(sock != -1 && write(sock, resume.c_str(), resume.size()) != (ssize_t)resume.size()) {
     PRACRO_ERR_LOG(journal, "write did not write all the bytes in the buffer.\n");
   }
-  PRACRO_DEBUG(journal, "%s", buf);
+  PRACRO_DEBUG(journal, "%s\n", buf);
 
 #ifndef WITHOUT_UPLOADSERVER
   // close socket
@@ -254,7 +255,7 @@ void JournalWriter::addEntry(Transaction &transaction, Commit &commit,
   }
 
   // Strip trailing whitespace, and add newlines.
-  std::string r = stripTrailingWhitepace(addNewlines(resume, 60));
+  std::string r = stripTrailingWhitepace(addNewlines(xml_decode(resume), 60));
   std::string m = commit.macro;
 
   ResumeEntry re;
-- 
cgit v1.2.3