Friendicaland

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 436adec50acac647bfd75ba9672d78d4caa31927..52ea9d58c90c253c1b969ac593316592c3edb8f8 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -79,6 +79,7 @@ function item_post(&$a) {
                // if this isn't the real parent of the conversation, find it
                if($r !== false && count($r)) {
                        $parid = $r[0]['parent'];
+                       $parent_uri = $r[0]['uri'];
                        if($r[0]['id'] != $r[0]['parent']) {
                                $r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
                                        intval($parid)
@@ -96,7 +97,7 @@ function item_post(&$a) {
                $parent = $r[0]['id'];
 
                // multi-level threading - preserve the info but re-parent to our single level threading
-               if(($parid) && ($parid != $parent))
+               //if(($parid) && ($parid != $parent))
                        $thr_parent = $parent_uri;
 
                if($parent_item['contact-id'] && $uid) {
@@ -305,6 +306,7 @@ function item_post(&$a) {
 
        $author = null;
        $self   = false;
+       $contact_id = 0;
 
        if((local_user()) && (local_user() == $profile_uid)) {
                $self = true;
@@ -313,9 +315,19 @@ function item_post(&$a) {
                );
        }
        elseif(remote_user()) {
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-                       intval(remote_user())
-               );
+               if(is_array($_SESSION['remote'])) {
+                       foreach($_SESSION['remote'] as $v) {
+                               if($v['uid'] == $profile_uid) {
+                                       $contact_id = $v['cid'];
+                                       break;
+                               }
+                       }
+               }                               
+               if($contact_id) {
+                       $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                               intval($contact_id)
+                       );
+               }
        }
 
        if(count($r)) {
@@ -544,6 +556,10 @@ function item_post(&$a) {
 
        $uri = item_new_uri($a->get_hostname(),$profile_uid);
 
+       // Fallback so that we alway have a thr-parent
+       if(!$thr_parent)
+               $thr_parent = $uri;
+
        $datarray = array();
        $datarray['uid']           = $profile_uid;
        $datarray['type']          = $post_type;
@@ -603,7 +619,7 @@ function item_post(&$a) {
 
        if($preview) {
                require_once('include/conversation.php');
-               $o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true);
+               $o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false, true);
                logger('preview: ' . $o);
                echo json_encode(array('preview' => $o));
                killme();
@@ -743,6 +759,7 @@ function item_post(&$a) {
                                        'verb'         => ACTIVITY_POST,
                                        'otype'        => 'item',
                                        'parent'       => $parent,
+                                       'parent_uri'   => $parent_item['uri']
                                ));
                        
                        }