diff options
author | fox <[email protected]> | 2017-11-18 06:27:36 +0000 |
---|---|---|
committer | Gogs <[email protected]> | 2017-11-18 06:27:36 +0000 |
commit | 99d770ca54a5dcb8e650fa0bb5ab574aabfda14d (patch) | |
tree | 99be43f330036407913345224816e91ae21b1fd4 | |
parent | 139c38535a57c7c11db8182a8d2bbf04c540c87f (diff) | |
parent | d1d05f7a12e3f044e76aefae9e2847e224469baf (diff) |
Merge branch 'comics-regex-patch' of JustAMacUser/tt-rss into master
-rw-r--r-- | plugins/af_comics/init.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php index 6bd3c23e2..54054399e 100644 --- a/plugins/af_comics/init.php +++ b/plugins/af_comics/init.php @@ -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'); |