For unique values we should use our guid function - not the random function

diff --git a/include/items.php b/include/items.php
index 848c21df366d405d16a00b24eaadbd0b36c58847..eaa0565467d2459facee812f082151fbc3b907be 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2968,7 +2968,7 @@ function item_is_remote_self($contact, &$datarray) {
                if ($contact['network'] != NETWORK_FEED) {
                        $datarray["guid"] = get_guid(32);
                        unset($datarray["plink"]);
-                       $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid']);
+                       $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid'], $datarray["guid"]);
                        $datarray["parent-uri"] = $datarray["uri"];
                        $datarray["extid"] = $contact['network'];
                        $urlpart = parse_url($datarray2['author-link']);

diff --git a/include/text.php b/include/text.php
index 18ce232f1d12650674502db2757fe8a342655e35..285c674d7002dc6fb1dd169b0016b7cb5fd8712a 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -470,11 +470,17 @@ if(! function_exists('item_new_uri')) {
  * @param int $uid
  * @return string
  */
-function item_new_uri($hostname,$uid) {
+function item_new_uri($hostname,$uid, $guid = "") {
 
        do {
                $dups = false;
-               $hash = random_string();
+
+               if ($guid == "")
+                       $hash = get_guid(32);
+               else {
+                       $hash = $guid;
+                       $guid = "";
+               }
 
                $uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash;
 

diff --git a/mod/item.php b/mod/item.php
index a5f483b3524089f778a226b792fae04c845473de..d203ce64d497bc977666c77e36b4de4b1c53932f 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -674,7 +674,7 @@ function item_post(&$a) {
 
        $notify_type = (($parent) ? 'comment-new' : 'wall-new' );
 
-       $uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid));
+       $uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid, $guid));
 
        // Fallback so that we alway have a thr-parent
        if(!$thr_parent)