post/thread views are renamed, search bugs fixed
This commit is contained in:
parent
574f778411
commit
1792046a4f
20 changed files with 83 additions and 77 deletions
|
@ -1266,7 +1266,7 @@ function photos_content(App $a)
|
|||
// as a "post" but displaying instead the photo it is linked to
|
||||
|
||||
/// @todo Rewrite this query. To do so, $sql_extra must be changed
|
||||
$linked_items = q("SELECT `id` FROM `post-view` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
|
||||
$linked_items = q("SELECT `id` FROM `post-user-view` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
|
||||
DBA::escape($datum)
|
||||
);
|
||||
if (DBA::isResult($linked_items)) {
|
||||
|
|
|
@ -412,8 +412,8 @@ function ping_get_notifications($uid)
|
|||
|
||||
do {
|
||||
$r = q(
|
||||
"SELECT `notify`.*, `post-view`.`visible`, `post-view`.`deleted`
|
||||
FROM `notify` LEFT JOIN `post-view` ON `post-view`.`id` = `notify`.`iid`
|
||||
"SELECT `notify`.*, `post`.`visible`, `post`.`deleted`
|
||||
FROM `notify` LEFT JOIN `post` ON `post`.`uri-id` = `notify`.`uri-id`
|
||||
WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
|
||||
AND NOT (`notify`.`type` IN (%d, %d))
|
||||
AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue