Merge branch 'ent-2268-fallo-en-la-vista-de-RSS-de-eventos' into 'develop'

Fixed rss events due to secondary groups See merge request artica/pandorafms!1481
2018-05-23 08:45:45 +02:00 · 2018-05-23 08:45:45 +02:00 · 6727941bac
parent 076724ba35 fe124bff5f
commit 6727941bac
1 changed files with 2 additions and 1 deletions
--- a/pandora_console/operation/events/events_rss.php
+++ b/pandora_console/operation/events/events_rss.php
@ -138,7 +138,8 @@ require('events.build_query.php');
 ////////////////////////////////////////////////////////////////////////

 $sql = "SELECT *
-	FROM tevento
+	FROM tevento te LEFT JOIN tagent_secondary_group tasg
+		ON te.id_grupo = tasg.id_group
 	WHERE 1=1 " . $sql_post . "
 	ORDER BY utimestamp DESC";