Merged changes from master

This commit is contained in:
Brian O'Donnell
2015-07-06 21:16:12 -04:00
parent c86e165726
commit 085ba1853f
+6 -1
View File
@@ -279,7 +279,7 @@ sub get_feed_items {
push ( @hashtags, @categories );
}
# extract image link and hover text if it exists
# extract image link and hover text from description if it exists
if( defined $item->{'description'} ){
$item->{'description'} =~ / src='(https?:\/\/[^']+)/ unless $item->{'description'} =~ / src="(https?:\/\/[^"]+)/;
@@ -290,6 +290,11 @@ sub get_feed_items {
}
}
# extract the image link from the enclosure tag if it exists
if( not length $image and defined $item->{'enclosure'} and defined $item->{'enclosure'}->{'type'} and $item->{'enclosure'}->{'type'} =~ /^image\// ){
$image = $item->{'enclosure'}->{'url'} if defined $item->{'enclosure'}->{'url'};
}
@hashtags = sort @hashtags;
if( defined $item->{'guid'} ){