[Fmsystem-commits] [11384] bkbooking: stavanger bugfix

[Kjell Arne Espedal]

Revision: 11384
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11384
Author:   kjell
Date:     2013-10-21 10:19:49 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
bkbooking: stavanger bugfix

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.bobooking.inc.php

Modified: branches/stavangerkommune/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.bobooking.inc.php       
2013-10-21 09:18:59 UTC (rev 11383)
+++ branches/stavangerkommune/booking/inc/class.bobooking.inc.php       
2013-10-21 10:19:49 UTC (rev 11384)
@@ -491,14 +491,20 @@
 
                                                $e['conflicts'][] = $b;
 
-                        if ($b['from_'] < $e['from_'] && $b['to_'] < $e['to_'])
+                        $bf = $b['from_'];
+                        $bt = $b['to_'];            
+
+                        if ($bf < $e['from_'])
                         {
                             $b['to_'] = $e['from_'];                       
+                            $b['from_'] = $bf;                       
                             $new_bookings[] = $b;        
                         }
-                        if ($e['to_'] < $b['to_'])
+
+                        if ($e['to_'] < $bt)
                         {
                             $b['from_'] = $e['to_'];                       
+                            $b['to_'] = $bt;                       
                             $new_bookings[] = $b;        
                         }