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

Merge branch 'ent-4917-Pete-SQL-al-añadir-un-dia-especial-a-la-lista-de-dias-especiales' into 'develop'

Browse Source 
Ent 4917 pete sql al añadir un dia especial a la lista de dias especiales

See merge request artica/pandorafms!2861
This commit is contained in:
vgilc 2019-12-10 11:43:46 +01:00
commit f4372bb766
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/operation/menu.php
View File

@ -386,10 +386,10 @@ if (check_acl($config['id_user'], 0, 'ER')
) )
); );
if ($user_filter !== false) { if ($user_filter !== false) {
$filter = events_get_event_filter($user_filter['id_filter']); $user_event_filter = events_get_event_filter($user_filter['id_filter']);
} else { } else {
// Default. // Default.
$filter = [ $user_event_filter = [
'status' => EVENT_NO_VALIDATED, 'status' => EVENT_NO_VALIDATED,
'event_view_hr' => $config['event_view_hr'], 'event_view_hr' => $config['event_view_hr'],
'group_rep' => 1, 'group_rep' => 1,
@ -399,7 +399,7 @@ if (check_acl($config['id_user'], 0, 'ER')
]; ];
} }
$fb64 = base64_encode(json_encode($filter)); $fb64 = base64_encode(json_encode($user_event_filter));
// RSS. // RSS.
$sub['operation/events/events_rss.php?user='.$config['id_user'].'&hashup='.$hashup.'&fb64='.$fb64]['text'] = __('RSS'); $sub['operation/events/events_rss.php?user='.$config['id_user'].'&hashup='.$hashup.'&fb64='.$fb64]['text'] = __('RSS');