From: Michael Vogel <icarus@dabo.de>
Date: Sun, 10 May 2015 08:08:29 +0000 (+0200)
Subject: Bugfix: Empty reshares in Diaspora
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c6f80eaa58df94dd4c278ea5d9f3523f774e8b84;p=friendica.git

Bugfix: Empty reshares in Diaspora

This bugfix was already accepted for the Develop-branch. The bug is very annoying on larger systems. (Single user systems aren't affected by this).
---

diff --git a/include/diaspora.php b/include/diaspora.php
index dd877112ba..9ca30563d7 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1075,7 +1075,7 @@ function diaspora_reshare($importer,$xml,$msg) {
 	$create_original_post = false;
 
 	// Do we already have this item?
-	$r = q("SELECT `body`, `tag`, `app`, `author-link`, `plink` FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
+	$r = q("SELECT `body`, `tag`, `app`, `created`, `author-link`, `plink` FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
 		dbesc($orig_guid),
 		dbesc(NETWORK_DIASPORA)
 	);
@@ -1087,8 +1087,15 @@ function diaspora_reshare($importer,$xml,$msg) {
 		require_once('include/api.php');
 		if (api_share_as_retweet($r[0]))
 			$r = array();
-		else
-			$orig_url = $a->get_baseurl().'/display/'.$orig_guid;
+		else {
+			$body = $r[0]["body"];
+			$str_tags = $r[0]["tag"];
+			$app = $r[0]["app"];
+			$orig_created = $r[0]["created"];
+			$orig_author = $r[0]["author-link"];
+			$create_original_post = ($body != "");
+			$orig_url = $a->get_baseurl()."/display/".$orig_guid;
+		}
 	}
 
 	if (!count($r)) {