Merge branch '1.9.1' into devel

This commit is contained in:
martin 2011-09-17 12:37:15 -04:00
commit 62f0d1c7b2
1 changed files with 2 additions and 3 deletions
airtime_mvc/application/models

View File

@ -307,9 +307,8 @@ class Schedule {
$row["id"] = $row["group_id"];
}
} else {
$sql = "SELECT MIN(st.name) AS name,"
." MIN(pt.creator) AS creator,"
." st.group_id, "
$sql = "SELECT MIN(pt.creator) AS creator,"
." st.group_id,"
." SUM(st.clip_length) AS clip_length,"
." MIN(st.file_id) AS file_id,"
." COUNT(*) as count,"