Revision: 2279
http://mrbs.svn.sourceforge.net/mrbs/?rev=2279&view=rev
Author: cimorrison
Date: 2012-04-04 15:35:28 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Fixed bug which meant that the correct timezone wasn't necessarily being used
when dragging a booking.
Modified Paths:
--------------
mrbs/trunk/web/edit_entry_handler.php
Modified: mrbs/trunk/web/edit_entry_handler.php
===================================================================
--- mrbs/trunk/web/edit_entry_handler.php 2012-03-26 14:28:34 UTC (rev
2278)
+++ mrbs/trunk/web/edit_entry_handler.php 2012-04-04 15:35:28 UTC (rev
2279)
@@ -109,6 +109,18 @@
}
+// Make sure the area corresponds to the room that is being booked
+if (!empty($rooms[0]))
+{
+ $area = get_area($rooms[0]);
+ get_area_settings($area); // Update the area settings
+}
+// and that $room is in $area
+if (get_area($room) != $area)
+{
+ $room = get_default_room($area);
+}
+
// If this is an Ajax request and we're being asked to commit the booking, then
// we'll only have been supplied with parameters that need to be changed.
Fill in
// the rest from the existing boking information.
@@ -196,19 +208,7 @@
// rather than silent truncation of the string.
$name = substr($name, 0, $maxlength['entry.name']);
-// Make sure the area corresponds to the room that is being booked
-if (!empty($rooms[0]))
-{
- $area = get_area($rooms[0]);
- get_area_settings($area); // Update the area settings
-}
-// and that $room is in $area
-if (get_area($room) != $area)
-{
- $room = get_default_room($area);
-}
-
// Set up the return URL. As the user has tried to book a particular room
and a particular
// day, we must consider these to be the new "sticky room" and "sticky day",
so modify the
// return URL accordingly.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
