Revert "Merge branch 'ryerson-history'"

This reverts commit a554c6f72c, reversing changes made to 2a0c9769aa.
2013-09-23 11:00:43 +02:00 · 2013-09-23 11:00:43 +02:00 · c8b73850b9
commit c8b73850b9
parent a554c6f72c
200 changed files with 5491 additions and 41784 deletions
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@ -949,7 +949,6 @@ SQL;
 AND ((si1.starts >= :start1::TIMESTAMP AND si1.starts < :end1::TIMESTAMP)
     OR (si1.ends > :start2::TIMESTAMP AND si1.ends <= :end2::TIMESTAMP)
     OR (si1.starts <= :start3::TIMESTAMP AND si1.ends >= :end3::TIMESTAMP))
-ORDER BY si1.starts
 SQL;
            return Application_Common_Database::prepareAndExecute( $sql,
                array(