Clean the url at "poco"

diff --git a/include/socgraph.php b/include/socgraph.php
index c1648fbbfa5ea4bb2960ff31e7deea6deb05c058..889d16ee6588530ab4e73db56f51c9ba4e17282e 100644 (file)
--- 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 = "";