Merge pull request #1343 from annando/1502-diaspora-guid-links

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 1cfada7f64f89c271c1942f0293ff6e570c13a76..2d3c31af0c3f7a32209d702d2d8dd315d619541e 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1643,7 +1643,8 @@
 
 
                $user_info = api_get_user($a);
-               $ret = api_format_items($item,$user_info)[0];
+               $rets = api_format_items($item,$user_info);
+               $ret = $rets[0];
 
                $data = array('$status' => $ret);
                switch($type){
@@ -2067,7 +2068,7 @@
                $ret = Array();
 
                foreach($r as $item) {
-                       api_share_as_retweet($a, api_user(), $item);
+                       api_share_as_retweet($item);
 
                        localize_item($item);
                        $status_user = api_item_get_user($a,$item);
@@ -2619,7 +2620,7 @@
 
 
 
-function api_share_as_retweet($a, $uid, &$item) {
+function api_share_as_retweet(&$item) {
        $body = trim($item["body"]);
 
        // Skip if it isn't a pure repeated messages
@@ -2663,6 +2664,15 @@ function api_share_as_retweet($a, $uid, &$item) {
        if ($matches[1] != "")
                $avatar = $matches[1];
 
+       $link = "";
+       preg_match("/link='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $link = $matches[1];
+
+       preg_match('/link="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $link = $matches[1];
+
        $shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$2",$body);
 
        if (($shared_body == "") OR ($profile == "") OR ($author == "") OR ($avatar == ""))
@@ -2672,6 +2682,7 @@ function api_share_as_retweet($a, $uid, &$item) {
        $item["author-name"] = $author;
        $item["author-link"] = $profile;
        $item["author-avatar"] = $avatar;
+       $item["plink"] = $link;
 
        return(true);