diff --git a/notifications_dismissed.php b/notifications_dismissed.php index 35b29d35..2e42b760 100644 --- a/notifications_dismissed.php +++ b/notifications_dismissed.php @@ -6,7 +6,6 @@ $order = "DESC"; require_once "inc_all.php"; - //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); @@ -14,11 +13,10 @@ $url_query_strings_sort = http_build_query($get_copy); $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM notifications - LEFT JOIN users ON notification_dismissed_by = user_id LEFT JOIN clients ON notification_client_id = client_id - WHERE (notification_type LIKE '%$q%' OR notification LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%') + WHERE (notification_type LIKE '%$q%' OR notification LIKE '%$q%' OR client_name LIKE '%$q%') AND DATE(notification_timestamp) BETWEEN '$dtf' AND '$dtt' - AND (notification_user_id = $session_user_id OR notification_user_id = 0) + AND notification_user_id = $session_user_id AND notification_dismissed_at IS NOT NULL ORDER BY $sort $order LIMIT $record_from, $record_to @@ -93,11 +91,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Dismissed At -