From 883e8b54519a498c3d07536b29d1b1bc223984e0 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 21 Apr 2016 07:24:00 +0200 Subject: [PATCH] Clean the url at "poco" --- include/socgraph.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index c1648fbbf..889d16ee6 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -174,8 +174,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca $gcid = ""; - $alternate = poco_alternate_ostatus_url($profile_url); - if ($profile_url == "") return $gcid; @@ -187,13 +185,19 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca "identi.ca", "alpha.app.net"))) return $gcid; - $orig_updated = $updated; - // 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 if ($network == NETWORK_STATUSNET) $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 if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link($a->get_baseurl()."/photo/"))) $profile_photo = "";