diff options
| author | rvelices <rv-github@modusoptimus.com> | 2007-10-09 22:43:09 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2007-10-09 22:43:09 +0000 |
| commit | 5aafffb22b39c7347e261e2a7f56ba541e5f079e (patch) | |
| tree | ddfbb654823b184c8596ba5b62f3597f0860f1f5 /include/feedcreator.class.php | |
| parent | 762562ddbee37d8facc6aac6a313bb11ea540526 (diff) | |
- 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
Diffstat (limited to 'include/feedcreator.class.php')
| -rw-r--r-- | include/feedcreator.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
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}; } } |