summaryrefslogtreecommitdiffstats
path: root/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php')
-rw-r--r--vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php
index 5bb930b22..154ed3cfb 100644
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php
@@ -192,7 +192,7 @@ class Atom extends Parser
*/
public function findItemUrl(SimpleXMLElement $entry, Item $item)
{
- $item->url = $this->getUrl($entry, 'alternate');
+ $item->url = $this->getUrl($entry, 'alternate', true);
}
/**
@@ -245,7 +245,13 @@ class Atom extends Parser
*/
public function findItemLanguage(SimpleXMLElement $entry, Item $item, Feed $feed)
{
- $item->language = $feed->language;
+ $language = (string) $entry->attributes('xml', true)->{'lang'};
+
+ if ($language === '') {
+ $language = $feed->language;
+ }
+
+ $item->language = $language;
}
/**
@@ -283,7 +289,7 @@ class Atom extends Parser
private function findLink(SimpleXMLElement $xml, $rel)
{
foreach ($xml->link as $link) {
- if (empty($rel) || $rel === (string) $link['rel']) {
+ if ($rel === (string) $link['rel']) {
return $link;
}
}