X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=1dbf21c73755557b84a1dfcfa73c997380498886;hb=497fd34026fbaa83b11a64d3a0a6e20f1360e5d6;hp=3ee491e50538cd26d2347f294a223c9272399bf9;hpb=c3ed6f7d0116dfc5a5a13ee5c88b75bb8c86a76c;p=friendica.git

diff --git a/include/Contact.php b/include/Contact.php
index 3ee491e505..1dbf21c737 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -45,10 +45,10 @@ function user_remove($uid) {
 	// don't delete yet, will be done later when contacts have deleted my stuff
 	// q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
 	q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid));
-	proc_run('php', "include/notifier.php", "removeme", $uid);
+	proc_run(PRIORITY_HIGH, "include/notifier.php", "removeme", $uid);
 
 	// Send an update to the directory
-	proc_run('php', "include/directory.php", $r[0]['url']);
+	proc_run(PRIORITY_LOW, "include/directory.php", $r[0]['url']);
 
 	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
@@ -209,21 +209,21 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 
 	// Fetch contact data from the contact table for the given user
 	$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
-			`keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self`
+			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self`
 		FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
 			dbesc(normalise_link($url)), intval($uid));
 
 	// Fetch the data from the contact table with "uid=0" (which is filled automatically)
 	if (!$r)
 		$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
-				`keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, 0 AS `self`
+				`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, 0 AS `self`
 			FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
 				dbesc(normalise_link($url)));
 
 	// Fetch the data from the gcontact table
 	if (!$r)
 		$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
-				`keywords`, `gender`, `photo`, `photo` AS `thumb`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self`
+				`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self`
 			FROM `gcontact` WHERE `nurl` = '%s'",
 				dbesc(normalise_link($url)));
 
@@ -267,12 +267,15 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 	if (($profile["network"] == "") AND isset($default["network"]))
 		$profile["network"] = $default["network"];
 
-	if (!isset($profile["thumb"]) AND isset($profile["photo"]))
+	if (($profile["thumb"] == "") AND isset($profile["photo"]))
 		$profile["thumb"] = $profile["photo"];
 
+	if (($profile["micro"] == "") AND isset($profile["thumb"]))
+		$profile["micro"] = $profile["thumb"];
+
 	if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND
 		in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
-		proc_run('php',"include/update_gcontact.php", $profile["gid"]);
+		proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
 
 	// Show contact details of Diaspora contacts only if connected
 	if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
@@ -628,11 +631,11 @@ function posts_from_contact($a, $contact_id) {
 	$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
 			`author-name` AS `name`, `owner-avatar` AS `photo`,
 			`owner-link` AS `url`, `owner-avatar` AS `thumb`
-		FROM `item` FORCE INDEX (`uid_contactid_created`)
+		FROM `item` FORCE INDEX (`uid_contactid_id`)
 		WHERE `item`.`uid` = %d AND `contact-id` = %d
 			AND `author-link` IN ('%s', '%s')
 			AND NOT `deleted` AND NOT `moderated` AND `visible`
-		ORDER BY `item`.`created` DESC LIMIT %d, %d",
+		ORDER BY `item`.`id` DESC LIMIT %d, %d",
 		intval(local_user()),
 		intval($contact_id),
 		dbesc(str_replace("https://", "http://", $contact["url"])),