clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #646 from annando/master

Browse Source 
OStatus conversations, "vier" and diaspora android client
This commit is contained in:
fermionic
2013-03-10 15:24:27 -07:00
parent ce7217c8f6 5d3613c8bc
commit 91a6a1cb25
4 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/enotify.php
+1 -2
View File
@@ -214,11 +214,10 @@ function notification($params) {
}
if($params['type'] == NOTIFY_CONFIRM) {
}
if($params['type'] == NOTIFY_SYSTEM) {
}
$h = array(
include/ostatus_conversation.php
+6
View File
@@ -90,6 +90,12 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
$items = array_reverse($conv_as->items);
foreach ($items as $single_conv) {
if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
$single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
if (@!$single_conv->id)
continue;
if ($first_id == "") {
$first_id = $single_conv->id;