friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #8832 from annando/fix-db-error 

Fix database error ""Unknown column 'parent-item.author-id'"
This commit is contained in:
Hypolite Petovan 2020-06-30 14:55:52 -04:00 committed by GitHub
parent dc5838ecf9 6aadb6b923
commit b9873a88a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/Item.php
View File

@ -787,12 +787,12 @@ class Item
$joins .= " LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`";
}
if ((strpos($sql_commands, "`parent-item`.") !== false) || (strpos($sql_commands, "`parent-author`.") !== false)) {
if ((strpos($sql_commands, "`parent-item`.") !== false) || (strpos($sql_commands, "`parent-item-author`.") !== false)) {
$joins .= " STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`";
}
if (strpos($sql_commands, "`parent-item-author`.") !== false) {
$joins .= " STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`";
if (strpos($sql_commands, "`parent-item-author`.") !== false) {
$joins .= " STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`";
}
}
return $joins;