Revision: 2564
https://sourceforge.net/p/mrbs/code/2564/
Author: cimorrison
Date: 2012-11-27 18:13:38 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Fixed bug causing the wrong mode (periods/times) to be used in certain
circumstances for reporting durations
Modified Paths:
--------------
mrbs/trunk/web/mrbs_sql.inc
Modified: mrbs/trunk/web/mrbs_sql.inc
===================================================================
--- mrbs/trunk/web/mrbs_sql.inc 2012-11-27 15:23:55 UTC (rev 2563)
+++ mrbs/trunk/web/mrbs_sql.inc 2012-11-27 18:13:38 UTC (rev 2564)
@@ -1040,7 +1040,6 @@
function mrbsGetBookingInfo($id, $series, $silent=FALSE)
{
global $tbl_entry, $tbl_repeat, $tbl_room, $tbl_area;
- global $approval_enabled, $enable_periods;
// Check that we've got an id
if (!isset($id))
@@ -1075,6 +1074,7 @@
"A.area_admin_email",
"M.disabled AS room_disabled",
"A.disabled AS area_disabled",
+ "A.enable_periods",
"(end_time - start_time) AS duration");
foreach ($table_fields as $field)
@@ -1161,7 +1161,7 @@
// Now get the duration.
// Don't translate the units at this stage. We'll translate them later.
- $d = get_duration($row['start_time'], $row['end_time'], $enable_periods,
FALSE);
+ $d = get_duration($row['start_time'], $row['end_time'],
$row['enable_periods'], FALSE);
$row['duration'] = $d['duration'];
$row['dur_units'] = $d['dur_units'];
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
