nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5700 from annando/issue-5653

Browse source 
Issue 5653: The mastodonemoji addon hadn't got all needed data.
This commit is contained in:
Hypolite Petovan 2018-08-29 20:17:15 -04:00 committed by GitHub
parent dfbac99aa6 c72d1bc8fd
commit f18650f3b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Model/Item.php
View file

@ -1462,15 +1462,6 @@ class Item extends BaseObject
return 0; return 0;
} }
// These fields aren't stored anymore in the item table, they are fetched upon request
unset($item['author-link']);
unset($item['author-name']);
unset($item['author-avatar']);
unset($item['owner-link']);
unset($item['owner-name']);
unset($item['owner-avatar']);
if ($item['network'] == Protocol::PHANTOM) { if ($item['network'] == Protocol::PHANTOM) {
logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG); logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG);
@ -1708,6 +1699,15 @@ class Item extends BaseObject
unset($item['postopts']); unset($item['postopts']);
unset($item['inform']); unset($item['inform']);
// These fields aren't stored anymore in the item table, they are fetched upon request
unset($item['author-link']);
unset($item['author-name']);
unset($item['author-avatar']);
unset($item['owner-link']);
unset($item['owner-name']);
unset($item['owner-avatar']);
DBA::transaction(); DBA::transaction();
$ret = DBA::insert('item', $item); $ret = DBA::insert('item', $item);