diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2011-10-17 08:38:48 -0700 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-10-17 08:38:48 -0700 |
commit | 6f300a6cd76b0c9797cda77ce5abf63e172cd254 (patch) | |
tree | 0500ac70f360a6b89a63ee89af8f939f4cf0e9e2 /modules/aggregator | |
parent | 24d994f688cef8e2190a7c994f89cae7015293aa (diff) | |
download | brdo-6f300a6cd76b0c9797cda77ce5abf63e172cd254.tar.gz brdo-6f300a6cd76b0c9797cda77ce5abf63e172cd254.tar.bz2 |
Issue #1268234 by derjochenmeyer: Move out rendering image from aggregator parser.
Diffstat (limited to 'modules/aggregator')
-rw-r--r-- | modules/aggregator/aggregator.pages.inc | 9 | ||||
-rw-r--r-- | modules/aggregator/aggregator.parser.inc | 13 |
2 files changed, 11 insertions, 11 deletions
diff --git a/modules/aggregator/aggregator.pages.inc b/modules/aggregator/aggregator.pages.inc index f47ec42be..8074ae82e 100644 --- a/modules/aggregator/aggregator.pages.inc +++ b/modules/aggregator/aggregator.pages.inc @@ -538,7 +538,14 @@ function template_preprocess_aggregator_feed_source(&$variables) { $feed = $variables['feed']; $variables['source_icon'] = theme('feed_icon', array('url' => $feed->url, 'title' => t('!title feed', array('!title' => $feed->title)))); - $variables['source_image'] = $feed->image; + + if (!empty($feed->image) && !empty($feed->title) && !empty($feed->link)) { + $variables['source_image'] = l(theme('image', array('path' => $feed->image, 'alt' => $feed->title)), $feed->link, array('html' => TRUE, 'attributes' => array('class' => 'feed-image'))); + } + else { + $variables['source_image'] = ''; + } + $variables['source_description'] = aggregator_filter_xss($feed->description); $variables['source_url'] = check_url(url($feed->link, array('absolute' => TRUE))); diff --git a/modules/aggregator/aggregator.parser.inc b/modules/aggregator/aggregator.parser.inc index cffd1c3aa..e9f1d2e8a 100644 --- a/modules/aggregator/aggregator.parser.inc +++ b/modules/aggregator/aggregator.parser.inc @@ -35,19 +35,12 @@ function aggregator_aggregator_parse($feed) { $image[$key] = trim($value); } - if (!empty($image['link']) && !empty($image['url']) && !empty($image['title'])) { - $image = l(theme('image', array('path' => $image['url'], 'alt' => $image['title'])), $image['link'], array('html' => TRUE)); - } - else { - $image = ''; - } - $etag = empty($feed->http_headers['etag']) ? '' : $feed->http_headers['etag']; // Add parsed data to the feed object. - $feed->link = !empty($channel['LINK']) ? $channel['LINK'] : ''; - $feed->description = !empty($channel['DESCRIPTION']) ? $channel['DESCRIPTION'] : ''; - $feed->image = $image; + $feed->link = !empty($channel['link']) ? $channel['link'] : ''; + $feed->description = !empty($channel['description']) ? $channel['description'] : ''; + $feed->image = !empty($image['url']) ? $image['url'] : ''; $feed->etag = $etag; $feed->modified = $modified; |