clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5659 from annando/notices-oh-no 

Oh no ... there are still some notices that want to be removed ...
This commit is contained in:
Tobias Diekershoff 2018-08-24 14:46:21 +02:00 committed by GitHub
parent 61693419e8 82d097879b
commit 6a549d4cfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -29,6 +29,10 @@ function add_page_info_data(array $data, $no_photos = false)
{ {
Addon::callHooks('page_info_data', $data); Addon::callHooks('page_info_data', $data);
if (empty($data['type'])) {
return '';
}
// It maybe is a rich content, but if it does have everything that a link has, // It maybe is a rich content, but if it does have everything that a link has,
// then treat it that way // then treat it that way
if (($data["type"] == "rich") && is_string($data["title"]) && if (($data["type"] == "rich") && is_string($data["title"]) &&

4
mod/photos.php
View File

@ -1394,7 +1394,7 @@ function photos_content(App $a)
$a->set_pager_total(DBA::count('item', $condition)); $a->set_pager_total(DBA::count('item', $condition));
$params = ['order' => ['id'], 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; $params = ['order' => ['id'], 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
$result = Item::selectForUser($link_item['uid'], [], $condition, $params); $result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
$items = Item::inArray($result); $items = Item::inArray($result);
if (local_user() && (local_user() == $link_item['uid'])) { if (local_user() && (local_user() == $link_item['uid'])) {
@ -1569,7 +1569,7 @@ function photos_content(App $a)
$body_e = BBCode::convert($item['body']); $body_e = BBCode::convert($item['body']);
$comments .= replace_macros($template,[ $comments .= replace_macros($template,[
'$id' => $item['item_id'], '$id' => $item['id'],
'$profile_url' => $profile_url, '$profile_url' => $profile_url,
'$name' => $item['author-name'], '$name' => $item['author-name'],
'$thumb' => $item['author-avatar'], '$thumb' => $item['author-avatar'],

7
src/Network/Probe.php
View File

@ -934,11 +934,12 @@ class Probe
$prof_data = []; $prof_data = [];
// The "addr" is not always part of the fetched data if (empty($data["addr"])) {
if (!empty($data["addr"])) { $probe_data = self::uri($profile_link);
$prof_data["addr"] = $data["addr"]; $data["addr"] = $probe_data["addr"];
} }
$prof_data["addr"] = $data["addr"];
$prof_data["nick"] = $data["nick"]; $prof_data["nick"] = $data["nick"];
$prof_data["dfrn-request"] = $data["request"]; $prof_data["dfrn-request"] = $data["request"];
$prof_data["dfrn-confirm"] = $data["confirm"]; $prof_data["dfrn-confirm"] = $data["confirm"];