Merge pull request #12289 from annando/fatal
Fix fatal errors because of unknown function/variable names
This commit is contained in:
commit
624231c665
1 changed files with 2 additions and 2 deletions
|
@ -622,7 +622,7 @@ class Post
|
||||||
public function addChild(Post $item)
|
public function addChild(Post $item)
|
||||||
{
|
{
|
||||||
if (!$item->getId()) {
|
if (!$item->getId()) {
|
||||||
Logger::fatal('Post object has no id', ['post' => $item]);
|
Logger::error('Post object has no id', ['post' => $item]);
|
||||||
return false;
|
return false;
|
||||||
} elseif ($this->getChild($item->getId())) {
|
} elseif ($this->getChild($item->getId())) {
|
||||||
Logger::warning('Post object already exists', ['post' => $item]);
|
Logger::warning('Post object already exists', ['post' => $item]);
|
||||||
|
@ -633,7 +633,7 @@ class Post
|
||||||
* Only add what will be displayed
|
* Only add what will be displayed
|
||||||
*/
|
*/
|
||||||
if ($item->getDataValue('network') === Protocol::MAIL && DI::userSession()->getLocalUserId() != $item->getDataValue('uid')) {
|
if ($item->getDataValue('network') === Protocol::MAIL && DI::userSession()->getLocalUserId() != $item->getDataValue('uid')) {
|
||||||
Logger::warning('Post object does not belong to local user', ['post' => $item, 'local_user' => $local_user]);
|
Logger::warning('Post object does not belong to local user', ['post' => $item, 'local_user' => DI::userSession()->getLocalUserId()]);
|
||||||
return false;
|
return false;
|
||||||
} elseif (DI::activity()->match($item->getDataValue('verb'), Activity::LIKE) ||
|
} elseif (DI::activity()->match($item->getDataValue('verb'), Activity::LIKE) ||
|
||||||
DI::activity()->match($item->getDataValue('verb'), Activity::DISLIKE)) {
|
DI::activity()->match($item->getDataValue('verb'), Activity::DISLIKE)) {
|
||||||
|
|
Loading…
Reference in a new issue