Browse Source

Merge pull request #9248 from annando/fatal

Avoid fatal error on the community page
tags/2020.09
Tobias Diekershoff 1 month ago
committed by GitHub
parent
commit
886cd9a357
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
  1. +5
    -1
      src/Content/PageInfo.php
  2. +1
    -1
      src/Object/Post.php

+ 5
- 1
src/Content/PageInfo.php View File

@@ -142,6 +142,10 @@ class PageInfo
$text .= " title='" . $data['title'] . "'";
}

if (empty($data['text'])) {
$data['text'] = '';
}

// Only embedd a picture link when it seems to be a valid picture ("width" is set)
if (!empty($data['images']) && !empty($data['images'][0]['width'])) {
$preview = str_replace(['[', ']'], ['[', ']'], htmlentities($data['images'][0]['src'], ENT_QUOTES, 'UTF-8', false));
@@ -163,7 +167,7 @@ class PageInfo
}
}

$text .= ']' . $data['text'] ?? '' . '[/attachment]';
$text .= ']' . $data['text'] . '[/attachment]';

$hashtags = '';
if (!empty($data['keywords'])) {


+ 1
- 1
src/Object/Post.php View File

@@ -977,7 +977,7 @@ class Post

if ($this->isToplevel()) {
if ($conv->getMode() !== 'profile') {
if ($this->getDataValue('wall') && !$this->getDataValue('self')) {
if ($this->getDataValue('wall') && !$this->getDataValue('self') && !empty($a->page_contact)) {
// On the network page, I am the owner. On the display page it will be the profile owner.
// This will have been stored in $a->page_contact by our calling page.
// Put this person as the wall owner of the wall-to-wall notice.


Loading…
Cancel
Save