friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6731 from annando/undefined-property 

Fixes "Undefined property: Friendica\App::$queue"
This commit is contained in:
Hypolite Petovan 2019-02-23 12:04:12 -05:00 committed by GitHub
parent 44953f045e 7703875b55
commit b9bd7b4f10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Worker.php
View File

@ -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

2
src/Object/Post.php
View File

@ -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'] . ' ';
}