Better control of xml enconding... still a lot of testing to do though.

1 files changed, 6 insertions, 7 deletions

diff --git a/utils/modules/news.php b/utils/modules/news.php
index 29187ea..00f1d4c 100644
--- a/utils/modules/news.php
+++ b/utils/modules/news.php
@@ -50,13 +50,12 @@ class NewsEntry {
 
 	public function write($fp)
 	{
-		fwrite($fp, "  <newsentry title=\"" .
-					 htmlspecialchars($this->title, ENT_QUOTES, "UTF-8") . "\"\n");
-		fwrite($fp, "             time=\"" . $this->time . "\"\n");
-		fwrite($fp, "             category=\"" . $this->category . "\"\n");
-		fwrite($fp, "             userid=\"" . $this->userid . "\"\n");
-		fwrite($fp, "             icon=\"" . $this->icon . "\">");
-		fwrite($fp, htmlspecialchars($this->description, ENT_QUOTES, "UTF-8"));
+		fwrite($fp, "  <newsentry title=\"".xmlenc($this->title)."\"\n");
+		fwrite($fp, "             time=\"" . xmlenc($this->time) . "\"\n");
+		fwrite($fp, "             category=\"" . xmlenc($this->category) . "\"\n");
+		fwrite($fp, "             userid=\"" . xmlenc($this->userid) . "\"\n");
+    fwrite($fp, "             icon=\"" . xmlenc($this->icon) . "\">");
+		fwrite($fp, xmlenc($this->description));
 		fwrite($fp, "  </newsentry>\n");
 	}