valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'comics-regex-patch' of JustAMacUser/tt-rss into master

This commit is contained in:
fox 2017-11-18 06:27:36 +00:00 committed by Gogs
parent 139c38535a d1d05f7a12
commit 99d770ca54
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/af_comics/init.php
View File

@ -65,7 +65,7 @@ class Af_Comics extends Plugin {
}
print "</ul>";
print "<p>".__('GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>).')."</p>";
print "<p>".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).")."</p>";
print "<p>".__('Drop any updated filters into <code>filters.local</code> in plugin directory.')."</p>";
@ -89,7 +89,7 @@ class Af_Comics extends Plugin {
if ($auth_login || $auth_pass)
return $feed_data;
if (preg_match('#^https?://feeds.feedburner.com/uclick/([-a-z]+)#', $fetch_url, $comic)) {
if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
$site_url = 'http://www.gocomics.com/' . $comic[1];
$article_link = $site_url . date('/Y/m/d');