mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-26 19:29:58 +03:00
- 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
This commit is contained in:
parent
762562ddbe
commit
5aafffb22b
5 changed files with 16 additions and 77 deletions
|
@ -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};
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue