Merge branch 'master' of github.com:ZoneMinder/zoneminder

2023-09-18 17:05:56 -04:00 · 2023-09-18 17:05:56 -04:00 · 25dfbf27f6
parent eea18b1663 b22ef6f328
commit 25dfbf27f6
1 changed files with 1 additions and 7 deletions
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@ -148,15 +148,9 @@ sub Sql {
        E.*, 
        unix_timestamp(E.StartDateTime) 
          AS Time,
-        GROUP_CONCAT(T.Name SEPARATOR ", ") 
+        CONCAT_WS(", ", (SELECT Name FROM Tags WHERE Id IN (SELECT TagId FROM Events_Tags WHERE EventId=E.Id))) 
      FROM Events 
        AS E 
-      LEFT JOIN Events_Tags 
-        AS ET 
-        ON E.Id = ET.EventId 
-      LEFT JOIN Tags 
-        AS T 
-        ON T.Id = ET.TagId 
    ';

    if ( $filter_expr->{terms} ) {