Merge pull request #10346 from MrPetovan/bug/notices

[friendica.git] / mod / update_contact.php

diff --git a/mod/update_contact.php b/mod/update_contact.php
index 5fb62e6a077de2ce919273c423f75a3c004698c1..e11e290a756f30b9f52821a270e4400e6c617090 100644 (file)
--- a/mod/update_contact.php
+++ b/mod/update_contact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,15 +24,21 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Model\Post;
 use Friendica\Module\Contact;
 
 function update_contact_content(App $a)
 {
-       if ($_GET["force"] == 1) {
-               $text = Contact::content([], true);
+       if (!empty($a->argv[1]) && (!empty($_GET['force']) || !DI::pConfig()->get(local_user(), 'system', 'no_auto_update'))) {
+               if (!empty($_GET['item'])) {
+                       $item = Post::selectFirst(['parent'], ['id' => $_GET['item']]);
+                       $parentid = $item['parent'] ?? 0;
+               } else {
+                       $parentid = 0;
+               }
+               $text = Contact::getConversationsHMTL($a, $a->argv[1], true, $parentid);
        } else {
                $text = '';
        }
-
        System::htmlUpdateExit($text);
 }