X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fthreads.php;h=0b2b26e8d242886b870fa3595563d031c23e4f32;hb=18cbe9f6ff275cbb363fd9a0a5014bc8fe3d9f7b;hp=d88307ecfb648ff1c653b0f7bfb55ab22fbf77b3;hpb=c18ace55173a2f521b7c7312f0726f37196515e9;p=friendica.git

diff --git a/include/threads.php b/include/threads.php
index d88307ecfb..0b2b26e8d2 100644
--- a/include/threads.php
+++ b/include/threads.php
@@ -1,7 +1,9 @@
 <?php
 function add_thread($itemid, $onlyshadow = false) {
-	$items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`,
-			`deleted`, `origin`, `forum_mode`, `mention`, `network`  FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
+	$items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
+			`moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`,
+			`deleted`, `origin`, `forum_mode`, `mention`, `network`, `author-id`, `owner-id`
+		FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
 	if (!$items)
 		return;
@@ -66,6 +68,7 @@ function add_thread($itemid, $onlyshadow = false) {
 
 			unset($item[0]['id']);
 			$item[0]['uid'] = 0;
+			$item[0]['origin'] = 0;
 			$item[0]['contact-id'] = get_contact($item[0]['author-link'], 0);
 			$public_shadow = item_store($item[0], false, false, true);
 
@@ -87,7 +90,6 @@ function add_shadow_entry($item) {
 
 	// Is there already a shadow entry?
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri']));
-
 	if (count($r))
 		return;
 
@@ -112,8 +114,8 @@ function update_thread_uri($itemuri, $uid) {
 }
 
 function update_thread($itemid, $setmention = false) {
-	$items = q("SELECT `uid`, `uri`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`,
-			`deleted`, `origin`, `forum_mode`, `network`  FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
+	$items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`,
+			`deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
 	if (!$items)
 		return;
@@ -126,7 +128,7 @@ function update_thread($itemid, $setmention = false) {
 	$sql = "";
 
 	foreach ($item AS $field => $data)
-		if ($field != "uri") {
+		if (!in_array($field, array("guid", "title", "body", "rendered-html", "rendered-hash"))) {
 			if ($sql != "")
 				$sql .= ", ";
 
@@ -135,40 +137,22 @@ function update_thread($itemid, $setmention = false) {
 
 	$result = q("UPDATE `thread` SET ".$sql." WHERE `iid` = %d", intval($itemid));
 
-	logger("update_thread: Update thread for item ".$itemid." - ".print_r($result, true)." ".print_r($item, true), LOGGER_DEBUG);
+	logger("Update thread for item ".$itemid." - guid ".$item["guid"]." - ".print_r($result, true)." ".print_r($item, true), LOGGER_DEBUG);
 
 	// Updating a shadow item entry
-	$items = q("SELECT `id`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
-			`moderated`, `visible`, `spam`, `starred`, `bookmark`, `deleted`, `origin`, `forum_mode`, `network`
-			FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["uri"]));
+	$items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"]));
 
 	if (!$items)
 		return;
 
-	$item = $items[0];
-
-	$result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `network` = '%s' WHERE `id` = %d",
+	$result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
 			dbesc($item["title"]),
 			dbesc($item["body"]),
-			dbesc($item["network"]),
-			intval($item["id"])
+			dbesc($item["rendered-html"]),
+			dbesc($item["rendered-hash"]),
+			intval($items[0]["id"])
 		);
-	logger("update_thread: Updating public shadow for post ".$item["id"]." Result: ".print_r($result, true), LOGGER_DEBUG);
-
-	/*
-	$sql = "";
-
-	foreach ($item AS $field => $data)
-		if ($field != "id") {
-			if ($sql != "")
-				$sql .= ", ";
-
-			$sql .= "`".$field."` = '".dbesc($data)."'";
-		}
-	//logger("update_thread: Updating public shadow for post ".$item["id"]." SQL: ".$sql, LOGGER_DEBUG);
-	$result = q("UPDATE `item` SET ".$sql." WHERE `id` = %d", intval($item["id"]));
-	logger("update_thread: Updating public shadow for post ".$item["id"]." Result: ".print_r($result, true), LOGGER_DEBUG);
-	*/
+	logger("Updating public shadow for post ".$items[0]["id"]." - guid ".$item["guid"]." Result: ".print_r($result, true), LOGGER_DEBUG);
 }
 
 function delete_thread_uri($itemuri, $uid) {