Merge pull request #6731 from annando/undefined-property

Fixes "Undefined property: Friendica\App::$queue"
2022.09-rc
Hypolite Petovan 2019-02-23 12:04:12 -05:00 zatwierdzone przez GitHub
commit b9bd7b4f10
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 3 dodań i 1 usunięć

Wyświetl plik

@ -369,6 +369,8 @@ class Worker
// For this reason the variables have to be initialized.
$a->getProfiler()->reset();
$a->queue = $queue;
$up_duration = microtime(true) - self::$up_start;
// Reset global data to avoid interferences

Wyświetl plik

@ -808,7 +808,7 @@ class Post extends BaseObject
foreach ($terms as $term) {
$profile = Contact::getDetailsByURL($term['url']);
if (($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
if (!empty($profile['addr']) && !empty($profile['contact-type']) && ($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) {
$text .= '@' . $profile['addr'] . ' ';
}