Merge remote-tracking branch 'upstream/master'

2016-06-05 20:03:54 +02:00 · 2016-06-05 20:03:54 +02:00 · 3891074b35
parent 788f9eafcd dc8fab4d42
commit 3891074b35
1 changed files with 1 additions and 1 deletions
--- a/api/domains.php
+++ b/api/domains.php
@ -91,7 +91,7 @@ if(isset($input->action) && $input->action == "getDomains") {
        LEFT OUTER JOIN records R ON D.id = R.domain_id
        LEFT OUTER JOIN permissions P ON D.id = P.domain
        WHERE (P.user=? OR ?)
-        GROUP BY D.id
+        GROUP BY D.id, D.name, D.type
        HAVING
        (D.name LIKE ? OR ?) AND
        (D.type=? OR ?)