tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed query notifications pending

Browse Source 
Former-commit-id: ac8c5b5cb1276c16b9339e2e86c88d856540be0d
This commit is contained in:
fbsanchez 2019-02-11 14:51:59 +01:00
parent 17c012cd83
commit 7893827652
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_messages.php
View File

@ -372,7 +372,7 @@ function messages_get_count(
AND up.id_grupo=ng.id_group AND up.id_grupo=ng.id_group
) ON tm.id_mensaje=ng.id_mensaje ) ON tm.id_mensaje=ng.id_mensaje
WHERE utimestamp_erased is null WHERE utimestamp_erased is null
AND (up.id_usuario="%s" OR nu.id_user="%s" OR ng.id_group=0) AND (nu.id_user="%s" OR (up.id_usuario="%s" AND ng.id_group=0))
) t ) t
%s', %s',
$user, $user,
@ -479,7 +479,7 @@ function messages_get_overview(
) ON tm.id_mensaje=ng.id_mensaje ) ON tm.id_mensaje=ng.id_mensaje
%s %s
WHERE utimestamp_erased is null WHERE utimestamp_erased is null
AND (up.id_usuario="%s" OR nu.id_user="%s" OR ng.id_group=0) AND (nu.id_user="%s" OR (up.id_usuario="%s" AND ng.id_group=0))
) t ) t
%s %s
%s %s

2
pandora_console/include/functions_notifications.php
View File

@ -142,7 +142,7 @@ function check_notification_readable(int $id_message)
AND up.id_grupo=ng.id_group AND up.id_grupo=ng.id_group
) ON tm.id_mensaje=ng.id_mensaje ) ON tm.id_mensaje=ng.id_mensaje
WHERE utimestamp_erased is null WHERE utimestamp_erased is null
AND (up.id_usuario="%s" OR nu.id_user="%s" OR ng.id_group=0)', AND (nu.id_user="%s" OR (up.id_usuario="%s" AND ng.id_group=0))',
$id_message, $id_message,
$config['id_user'], $config['id_user'],
$config['id_user'] $config['id_user']