Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8570 Modified Files: RssWriter.php RssWriter2.php Log Message: guard against duplicate RSS_ENCODING Index: RssWriter.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/RssWriter.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -2 -b -p -d -r1.11 -r1.12 --- RssWriter.php 6 Dec 2004 19:29:23 -0000 1.11 +++ RssWriter.php 24 Jul 2005 09:52:59 -0000 1.12 @@ -5,5 +5,6 @@ // Encoding for RSS output. -define('RSS_ENCODING', $GLOBALS['charset']); +if (!defined('RSS_ENCODING')) + define('RSS_ENCODING', $GLOBALS['charset']); /** Index: RssWriter2.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/RssWriter2.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -2 -b -p -d -r1.1 -r1.2 --- RssWriter2.php 6 Dec 2004 19:29:23 -0000 1.1 +++ RssWriter2.php 24 Jul 2005 09:52:59 -0000 1.2 @@ -6,5 +6,4 @@ // Encoding for RSS output. -define('RSS_ENCODING', $GLOBALS['charset']); include_once("lib/RssWriter.php");