[Fmsystem-commits] [9735] Only checks boundary conflicts against active seasons now

[Alexander Stevenson]

Revision: 9735
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9735
Author:   andvare
Date:     2012-07-04 12:27:01 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Only checks boundary conflicts against active seasons now

Modified Paths:
--------------
    trunk/booking/inc/class.soseason.inc.php

Modified: trunk/booking/inc/class.soseason.inc.php
===================================================================
--- trunk/booking/inc/class.soseason.inc.php    2012-07-04 12:25:59 UTC (rev 
9734)
+++ trunk/booking/inc/class.soseason.inc.php    2012-07-04 12:27:01 UTC (rev 
9735)
@@ -190,6 +190,8 @@
                                "bb_season s2 JOIN bb_season_resource AS sr2 
ON(s2.id=sr2.season_id) ".
                                "WHERE (s1.from_ <= s2.to_) AND (s2.from_ <= 
s1.to_) ".
                                "AND sr1.resource_id=sr2.resource_id ".
+                               "AND s1.active=1".
+                               "AND s2.active=1".
                                "AND s1.id=$season_id";
 
                        $this->db->query("SELECT 1 FROM bb_season_boundary AS 
sb1 ".