From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 10 Jul 2015 21:54:15 +0000 (+0300)
Subject: af_redditimgur: fix imgur single-image pages
X-Git-Tag: 16.3~232^2~21
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d4ac4fc6fdf639ebb00957dfea5935413bce541d;p=tt-rss.git

af_redditimgur: fix imgur single-image pages
---

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 6f2c7ff9..c4ec265d 100644
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -159,44 +159,10 @@ class Af_RedditImgur extends Plugin {
 					$found = true;
 				}
 
-				// links to imgur pages
-				$matches = array();
-				if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
-
-					$token = $matches[2];
-
-					$album_content = fetch_file_contents($entry->getAttribute("href"),
-						false, false, false, false, 10);
-
-					if ($album_content && $token) {
-						$adoc = new DOMDocument();
-						@$adoc->loadHTML($album_content);
-
-						if ($adoc) {
-							$axpath = new DOMXPath($adoc);
-							$aentries = $axpath->query('(//img[@src])');
-
-							foreach ($aentries as $aentry) {
-								if (preg_match("/\/\/i.imgur.com\/$token\./", $aentry->getAttribute("src"))) {
-									$img = $doc->createElement('img');
-									$img->setAttribute("src", $aentry->getAttribute("src"));
-
-									$br = $doc->createElement('br');
-
-									$entry->parentNode->insertBefore($img, $entry);
-									$entry->parentNode->insertBefore($br, $entry);
-
-									$found = true;
-
-									break;
-								}
-							}
-						}
-					}
-				}
+				// linked albums & pages
 
-				// linked albums, ffs
-				if (preg_match("/^https?:\/\/imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
+				if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches) ||
+					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);