tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Clean the url at "poco"

Browse source
This commit is contained in:
Michael Vogel 2016-04-21 07:24:00 +02:00 committed by Roland Haeder
parent 761fa37f94
commit 883e8b5451
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/socgraph.php
View file

@ -174,8 +174,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
$gcid = ""; $gcid = "";
$alternate = poco_alternate_ostatus_url($profile_url);
if ($profile_url == "") if ($profile_url == "")
return $gcid; return $gcid;
@ -187,13 +185,19 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
"identi.ca", "alpha.app.net"))) "identi.ca", "alpha.app.net")))
return $gcid; return $gcid;
$orig_updated = $updated;
// Don't store the statusnet connector as network // Don't store the statusnet connector as network
// We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well // We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well
if ($network == NETWORK_STATUSNET) if ($network == NETWORK_STATUSNET)
$network = ""; $network = "";
// Assure that there are no parameter fragments in the profile url
if (in_array($network, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
$profile_url = clean_contact_url($profile_url);
$alternate = poco_alternate_ostatus_url($profile_url);
$orig_updated = $updated;
// The global contacts should contain the original picture, not the cached one // The global contacts should contain the original picture, not the cached one
if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link($a->get_baseurl()."/photo/"))) if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link($a->get_baseurl()."/photo/")))
$profile_photo = ""; $profile_photo = "";