Browse Source
Merge pull request #8832 from annando/fix-db-error
Fix database error ""Unknown column 'parent-item.author-id'"
pull/8834/head
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
src/Model/Item.php
|
|
|
@ -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; |
|
|
|
|
GitHub