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

Merge branch 'master' of git.fakecake.org:tt-rss

This commit is contained in:
Andrew Dolgov 2015-07-06 12:10:31 +03:00
parent 5956f312b7 0989732107
commit 6affdc59a3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
/deploy.exclude
/deploy.sh
/messages.mo
*~
*.DS_Store

5
plugins/af_redditimgur/init.php
View File

@ -84,8 +84,7 @@ class Af_RedditImgur extends Plugin {
$found = true;
}
if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9])?$/i", $entry->getAttribute("href"))) {
if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href"))) {
$img = $doc->createElement('img');
$img->setAttribute("src", $entry->getAttribute("href"));
@ -133,7 +132,7 @@ class Af_RedditImgur extends Plugin {
}
// linked albums, ffs
if (preg_match("/^https?:\/\/imgur.com\/(a|album)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
if (preg_match("/^https?:\/\/imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
$album_content = fetch_file_contents($entry->getAttribute("href"),
false, false, false, false, 10);