Title: SF.net SVN: mrbs:[2439] mrbs/branches/flexible_day_end
- Revision
- 2439
- Author
- cimorrison
- Date
- 2012-09-26 16:10:21 +0000 (Wed, 26 Sep 2012)
Log Message
Merged in latest changes from trunk
Modified Paths
Property Changed
Diff
Property changes: mrbs/branches/flexible_day_end
Modified: svn:mergeinfo
/mrbs/branches/datatables:1863-2063
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/draggable_bookings:2074-2141
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/ics_import:2250-2262
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:2402-2408
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datatables:1863-2063
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/draggable_bookings:2074-2141
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/ics_import:2250-2262
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:2402-2438
Modified: mrbs/branches/flexible_day_end/web/report.php (2438 => 2439)
--- mrbs/branches/flexible_day_end/web/report.php 2012-09-26 15:57:44 UTC (rev 2438)
+++ mrbs/branches/flexible_day_end/web/report.php 2012-09-26 16:10:21 UTC (rev 2439)
@@ -900,21 +900,21 @@
if (($match_private != PRIVATE_BOTH) && ($match_private != ''))
{
$sql .= " AND ";
- $sql .= "(status&" . STATUS_PRIVATE;
+ $sql .= "(E.status&" . STATUS_PRIVATE;
$sql .= ($match_private) ? "!=0)" : "=0)"; // Note that private works the other way round to the next two
}
// Match the confirmation status
if (($match_confirmed != CONFIRMED_BOTH) && ($match_confirmed != ''))
{
$sql .= " AND ";
- $sql .= "(status&" . STATUS_TENTATIVE;
+ $sql .= "(E.status&" . STATUS_TENTATIVE;
$sql .= ($match_confirmed) ? "=0)" : "!=0)";
}
// Match the approval status
if (($match_approved != APPROVED_BOTH) && ($match_approved != ''))
{
$sql .= " AND ";
- $sql .= "(status&" . STATUS_AWAITING_APPROVAL;
+ $sql .= "(E.status&" . STATUS_AWAITING_APPROVAL;
$sql .= ($match_approved) ? "=0)" : "!=0)";
}
------------------------------------------------------------------------------
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
