Fix fulfilled wishes visible for owner
This commit is contained in:
parent
528b2e37dd
commit
2831a132e6
2 changed files with 3 additions and 2 deletions
|
@ -61,6 +61,8 @@ class Wishlist
|
||||||
$WHERE = isset($sql['WHERE']) ? $sql['WHERE'] : '`wishlist` = ' . $this->id;
|
$WHERE = isset($sql['WHERE']) ? $sql['WHERE'] : '`wishlist` = ' . $this->id;
|
||||||
$ORDER_BY = isset($sql['ORDER_BY']) ? $sql['ORDER_BY'] : '`priority` DESC, `title` ASC, `url` ASC';
|
$ORDER_BY = isset($sql['ORDER_BY']) ? $sql['ORDER_BY'] : '`priority` DESC, `title` ASC, `url` ASC';
|
||||||
|
|
||||||
|
$WHERE .= ' AND (`status` != "' . Wish::STATUS_FULFILLED . '" OR `status` IS NULL)';
|
||||||
|
|
||||||
$this->wishes = $database
|
$this->wishes = $database
|
||||||
->query('SELECT ' . $SELECT . '
|
->query('SELECT ' . $SELECT . '
|
||||||
FROM ' . $FROM . '
|
FROM ' . $FROM . '
|
||||||
|
|
|
@ -80,8 +80,7 @@ $page->navigation();
|
||||||
OR `status` IS NULL
|
OR `status` IS NULL
|
||||||
OR `status` < unix_timestamp(CURRENT_TIMESTAMP - INTERVAL ' . Wish::STATUS_TEMPORARY_MINUTES . ' MINUTE)
|
OR `status` < unix_timestamp(CURRENT_TIMESTAMP - INTERVAL ' . Wish::STATUS_TEMPORARY_MINUTES . ' MINUTE)
|
||||||
)
|
)
|
||||||
AND (`status` != "' . Wish::STATUS_UNAVAILABLE . '" OR `status` IS NULL)
|
AND (`status` != "' . Wish::STATUS_UNAVAILABLE . '" OR `status` IS NULL)'
|
||||||
AND (`status` != "' . Wish::STATUS_FULFILLED . '" OR `status` IS NULL)'
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in a new issue