mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2520 from annando/1605-probe_feed

Browse source 
Bugfix: Feeds weren't detected correctly
This commit is contained in:
Tobias Diekershoff 2016-05-19 06:54:17 +02:00
parent bb3e957479 8daa49b233
commit 29f7cf0110
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/Scrape.php
View file

@ -835,7 +835,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
require_once('include/bbcode.php'); require_once('include/bbcode.php');
$address = GetProfileUsername($url, "", true); $address = GetProfileUsername($url, "", true);
$result2 = probe_url($address, $mode, ++$level); $result2 = probe_url($address, $mode, ++$level);
if ($result2['network'] != "") if (!in_array($result2['network'], array("", NETWORK_PHANTOM, NETWORK_FEED)))
$result = $result2; $result = $result2;
} }
@ -843,7 +843,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
if (($result['network'] == NETWORK_FEED) AND ($result['baseurl'] != "") AND ($result['nick'] != "")) { if (($result['network'] == NETWORK_FEED) AND ($result['baseurl'] != "") AND ($result['nick'] != "")) {
$addr = $result['nick'].'@'.str_replace("http://", "", $result['baseurl']); $addr = $result['nick'].'@'.str_replace("http://", "", $result['baseurl']);
$result2 = probe_url($addr, $mode, ++$level); $result2 = probe_url($addr, $mode, ++$level);
if (($result2['network'] != "") AND ($result2['network'] != NETWORK_FEED)) if (!in_array($result2['network'], array("", NETWORK_PHANTOM, NETWORK_FEED)))
$result = $result2; $result = $result2;
} }