Merge github.com:tobiasd/friendika

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 00bf1f910532ee8c06166154bfeca38b00bcefd7..320f716bf850f4dd415baac4d1a472fd7543f243 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -514,7 +514,8 @@ function diaspora_comment($importer,$xml,$msg) {
 
 
        if($parent_author_signature) {
-               $owner_signed_data = $guid . ';' . $parent_guid . ';' . $text . ';' . $msg['author'];
+//             $owner_signed_data = $guid . ';' . $parent_guid . ';' . $text . ';' . $msg['author'];
+               $owner_signed_data = $guid . ';' . $parent_guid . ';' . $text . ';' . $diaspora_handle;
 
                $parent_author_signature = base64_decode($parent_author_signature);
 
@@ -734,7 +735,8 @@ function diaspora_like($importer,$xml,$msg) {
        }
 
        if($parent_author_signature) {
-               $owner_signed_data = $guid . ';' . $parent_guid . ';' . $target_type . ';' . $positive . ';' . $msg['author'];
+//             $owner_signed_data = $guid . ';' . $parent_guid . ';' . $target_type . ';' . $positive . ';' . $msg['author'];
+               $owner_signed_data = $guid . ';' . $parent_guid . ';' . $target_type . ';' . $positive . ';' . $diaspora_handle;
 
                $parent_author_signature = base64_decode($parent_author_signature);
 
@@ -912,7 +914,7 @@ function diaspora_send_status($item,$owner,$contact) {
                        $detail['guid'] = $item['guid'];
                        $detail['handle'] = $myaddr;
                        $images[] = $detail;
-                       $body = str_replace($detail['str'],t('link to photo'),$body);
+                       $body = str_replace($detail['str'],t('link'),$body);
                }
        }       
 
@@ -974,7 +976,7 @@ function diaspora_send_images($item,$owner,$contact,$images) {
                        '$guid' => xmlify($r[0]['guid']),
                        '$handle' => xmlify($image['handle']),
                        '$public' => xmlify($public),
-                       '$created_at' => xmlify('UTC','UTC',$r[0]['created'],'Y-m-d h:i:s \U\T\C')
+                       '$created_at' => xmlify(datetime_convert('UTC','UTC',$r[0]['created'],'Y-m-d h:i:s \U\T\C'))
                ));
 
                logger('diaspora_send_photo: base message: ' . $msg, LOGGER_DATA);