Merged changes from master

This commit is contained in:
Brian O'Donnell
2015-07-06 20:32:19 -04:00
parent 34475890a9
commit c86e165726
+6 -4
View File
@@ -281,13 +281,14 @@ sub get_feed_items {
# extract image link and hover text if it exists # extract image link and hover text if it exists
if( defined $item->{'description'} ){ if( defined $item->{'description'} ){
if( $item->{'description'} =~ / src="(https?:\/\/[^"]+)/ ){ $item->{'description'} =~ / src='(https?:\/\/[^']+)/ unless $item->{'description'} =~ / src="(https?:\/\/[^"]+)/;
$image = $1 if defined $1;
if( $item->{'description'} =~ / title="([^"]+)/ ){ if( defined $1 ){
$image = $1;
$item->{'description'} =~ / title='([^']+)/ unless $item->{'description'} =~ / title="([^"]+)/;
$image_title = $1 if defined $1; $image_title = $1 if defined $1;
} }
} }
}
@hashtags = sort @hashtags; @hashtags = sort @hashtags;
@@ -356,6 +357,7 @@ sub decode_feed{
} }
$item->{'category'} = $entries->{'category'} if defined $entries->{'category'}; $item->{'category'} = $entries->{'category'} if defined $entries->{'category'};
$item->{'description'} = $entries->{$guid}->{'summary'}->{'content'} if defined $entries->{$guid}->{'summary'} and defined $entries->{$guid}->{'summary'}->{'content'};
push( @list, $item ) if defined $item->{'link'} and defined $item->{'title'}; push( @list, $item ) if defined $item->{'link'} and defined $item->{'title'};
} }