bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Fix wrong variable use in Model\Item::getTopLevelParent

Browse source 
- It was preventing items at levels 3 and beyond to be inserted
- Logging for missing top level parent has been bumped to notice
This commit is contained in:
Hypolite Petovan 2020-11-11 22:59:57 -05:00
parent eebcf1ae86
commit d3708cf1c2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Model/Item.php
View file

@ -1496,7 +1496,7 @@ class Item
$parent = self::selectFirst($fields, $condition, $params);
if (!DBA::isResult($parent)) {
Logger::info('item parent was not found - ignoring item', ['thr-parent' => $item['thr-parent'], 'uid' => $item['uid']]);
Logger::notice('item parent was not found - ignoring item', ['thr-parent' => $item['thr-parent'], 'uid' => $item['uid']]);
return [];
}
@ -1504,21 +1504,21 @@ class Item
return $parent;
}
$condition = ['uri' => $item['parent-uri'],
'parent-uri' => $item['parent-uri'],
'uid' => $item['uid']];
$condition = ['uri' => $parent['parent-uri'],
'parent-uri' => $parent['parent-uri'],
'uid' => $parent['uid']];
// We select wall = 1 in priority for top level permission checks
$params = ['order' => ['wall' => true]];
$toplevel_parent = self::selectFirst($fields, $condition, $params);
if (!DBA::isResult($toplevel_parent)) {
Logger::info('item parent was not found - ignoring item', ['parent-uri' => $item['parent-uri'], 'uid' => $item['uid']]);
Logger::notice('item top level parent was not found - ignoring item', ['parent-uri' => $parent['parent-uri'], 'uid' => $parent['uid']]);
return [];
}
if ($toplevel_parent['wall']
&& $toplevel_parent['uid'] &&
!self::isAllowedByUser($item, $toplevel_parent['uid'])
&& $toplevel_parent['uid']
&& !self::isAllowedByUser($item, $toplevel_parent['uid'])
) {
return [];
}