From 5aafffb22b39c7347e261e2a7f56ba541e5f079e Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 9 Oct 2007 22:43:09 +0000 Subject: - RSS feed is PWG charset - iptc are now converted from iso-8859-1 or utf-8 (automatic detection) to pwg charset - remove function get_language_filepath - load_language also checks for the default language git-svn-id: http://piwigo.org/svn/trunk@2132 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/feedcreator.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/feedcreator.class.php') diff --git a/include/feedcreator.class.php b/include/feedcreator.class.php index 2b23e9472..5138eb30e 100644 --- a/include/feedcreator.class.php +++ b/include/feedcreator.class.php @@ -391,7 +391,7 @@ class UniversalFeedCreator extends FeedCreator { $vars = get_object_vars($this); foreach ($vars as $key => $value) { // prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself - if (!in_array($key, array("_feed", "contentType", "encoding"))) { + if (!in_array($key, array("_feed", "contentType"/*PWG, "encoding"*/))) { $this->_feed->{$key} = $this->{$key}; } } -- cgit v1.2.3