--- enigma_dyn_timer.cpp	2008/04/12 08:49:45	1.2
+++ enigma_dyn_timer.cpp	2008/04/23 23:04:00	1.3
@@ -1,5 +1,5 @@
 /*
- * $Id: enigma_dyn_timer.cpp,v 1.2 2008/04/12 08:49:45 drecomx Exp $
+ * $Id: enigma_dyn_timer.cpp,v 1.3 2008/04/23 23:04:00 dr_best Exp $
  *
  * (C) 2005,2007 by digi_casi <digi_casi@tuxbox.org>
  *
@@ -84,6 +84,7 @@
 extern eString zap[5][5];
 extern eString getZapContent(eString path, int depth, bool addEPG, bool sortList, bool forceAll);
 extern bool playService(const eServiceReference& ref);
+extern eString XMLify(eString s, eString format);
 
 class myTimerEntry
 {
@@ -247,8 +248,8 @@
 		tmp.strReplace("#DURATION#", eString().sprintf("%d", se->duration));
 		tmp.strReplace("#DATE#", eString().sprintf("%02d.%02d.%04d", startTime.tm_mday, startTime.tm_mon + 1, startTime.tm_year + 1900));
 		tmp.strReplace("#TIME#", eString().sprintf("%02d:%02d", startTime.tm_hour, startTime.tm_min));
-		tmp.strReplace("#CHANNEL#", channel);
-		tmp.strReplace("#DESCRIPTION#", description);
+		tmp.strReplace("#CHANNEL#", XMLify(channel,format));
+		tmp.strReplace("#DESCRIPTION#", XMLify(description,format));
 		if (se->type & ePlaylistEntry::SwitchTimerEntry)
 			tmp.strReplace("#ACTION#", "ZAP");
 		else