diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php index d4d17fc9..5fc6b33c 100644 --- a/bridges/GelbooruBridge.php +++ b/bridges/GelbooruBridge.php @@ -67,7 +67,7 @@ class GelbooruBridge extends BridgeAbstract . $thumbnailUri . '" />

Dimensions: ' . strval($element->width) . ' x ' . strval($element->height) . '

Tags: ' . $item['tags']; - if (!is_null($element->source)) { + if (isset($element->source)) { $item['content'] .= '

Source: ' . $element->source . ''; } diff --git a/bridges/PcGamerBridge.php b/bridges/PcGamerBridge.php index 5ea15e8c..bac01ee8 100644 --- a/bridges/PcGamerBridge.php +++ b/bridges/PcGamerBridge.php @@ -28,7 +28,12 @@ class PcGamerBridge extends BridgeAbstract $item['title'] = $articleHtml->find('meta[name=parsely-title]', 0)->content; $item['content'] = html_entity_decode($articleHtml->find('meta[name=description]', 0)->content); $item['author'] = $articleHtml->find('meta[name=parsely-author]', 0)->content; - $item['enclosures'][] = $articleHtml->find('meta[name=parsely-image-url]', 0)->content; + + $imageUrl = $articleHtml->find('meta[name=parsely-image-url]', 0); + if ($imageUrl) { + $item['enclosures'][] = $imageUrl->content; + } + /* I don't know why every article has two extra tags, but because one matches another common tag, "guide," it needs to be removed. */ $item['categories'] = array_diff( diff --git a/bridges/ReutersBridge.php b/bridges/ReutersBridge.php index 77370d65..eceaddf7 100644 --- a/bridges/ReutersBridge.php +++ b/bridges/ReutersBridge.php @@ -420,7 +420,7 @@ class ReutersBridge extends BridgeAbstract { $description = ''; foreach ($contents as $content) { - $data; + $data = ''; if (isset($content['content'])) { $data = $content['content']; } diff --git a/bridges/WikipediaBridge.php b/bridges/WikipediaBridge.php index 30e551ed..28149d0f 100644 --- a/bridges/WikipediaBridge.php +++ b/bridges/WikipediaBridge.php @@ -277,7 +277,7 @@ class WikipediaBridge extends BridgeAbstract switch ($subject) { case WIKIPEDIA_SUBJECT_TFA: $element = $html->find('div[id=mp-tfa]', 0); - $this->addTodaysFeaturedArticleGeneric($element, $fullArticle, -1); + $this->addTodaysFeaturedArticleGeneric($element, $fullArticle, '...', -1); break; case WIKIPEDIA_SUBJECT_DYK: $element = $html->find('div[id=mp-dyk]', 0); @@ -296,7 +296,7 @@ class WikipediaBridge extends BridgeAbstract switch ($subject) { case WIKIPEDIA_SUBJECT_TFA: $element = $html->find('div[id=main-tfa]', 0); - $this->addTodaysFeaturedArticleGeneric($element, $fullArticle, -1); + $this->addTodaysFeaturedArticleGeneric($element, $fullArticle, '...', -1); break; case WIKIPEDIA_SUBJECT_DYK: $element = $html->find('div[id=main-dyk]', 0); diff --git a/lib/FeedExpander.php b/lib/FeedExpander.php index f537a76a..caface38 100644 --- a/lib/FeedExpander.php +++ b/lib/FeedExpander.php @@ -146,15 +146,15 @@ abstract class FeedExpander extends BridgeAbstract $this->collectAtom1($rssContent, $maxItems); break; default: - Debug::log('Unknown feed format/version'); - throw new \Exception('The feed format is unknown!'); + Debug::log(sprintf('Unable to detect feed format from `%s`', $url)); + throw new \Exception(sprintf('Unable to detect feed format from `%s`', $url)); } return $this; } /** - * Collect data from a RSS 1.0 compatible feed + * Collect data from an RSS 1.0 compatible feed * * @link http://web.resource.org/rss/1.0/spec RDF Site Summary (RSS) 1.0 *