Merge branch '1.9.1' into devel
This commit is contained in:
commit
62f0d1c7b2
|
@ -307,9 +307,8 @@ class Schedule {
|
||||||
$row["id"] = $row["group_id"];
|
$row["id"] = $row["group_id"];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$sql = "SELECT MIN(st.name) AS name,"
|
$sql = "SELECT MIN(pt.creator) AS creator,"
|
||||||
." MIN(pt.creator) AS creator,"
|
." st.group_id,"
|
||||||
." st.group_id, "
|
|
||||||
." SUM(st.clip_length) AS clip_length,"
|
." SUM(st.clip_length) AS clip_length,"
|
||||||
." MIN(st.file_id) AS file_id,"
|
." MIN(st.file_id) AS file_id,"
|
||||||
." COUNT(*) as count,"
|
." COUNT(*) as count,"
|
||||||
|
|
Loading…
Reference in New Issue