Merge pull request #503 from mattmundell/find_reports_trash-8.0

Also exclude reports from _trash table suffix (8.0)
greenbone · Apr 29, 2019 · 51544e2 · 51544e2
2 parents a477e63 + 8eedd01
commit 51544e2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/manage_sql.c b/src/manage_sql.c
@@ -4532,7 +4532,9 @@ find_resource_with_permission (const char* type, const char* uuid,
   switch (sql_int64 (resource,
                      "SELECT id FROM %ss%s WHERE uuid = '%s'%s%s;",
                      type,
-                     (strcmp (type, "task") && trash) ? "_trash" : "",
+                     (trash && strcmp (type, "task") && strcmp (type, "report"))
+                      ? "_trash"
+                      : "",
                      quoted_uuid,
                      strcmp (type, "task")
                       ? ""