Revision: 1578
http://mrbs.svn.sourceforge.net/mrbs/?rev=1578&view=rev
Author: cimorrison
Date: 2010-11-03 11:12:05 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/from_to_bookings/web/functions.inc
Property Changed:
----------------
mrbs/branches/from_to_bookings/
mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/from_to_bookings
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1491-1571
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1491-1577
Modified: mrbs/branches/from_to_bookings/web/functions.inc
===================================================================
--- mrbs/branches/from_to_bookings/web/functions.inc 2010-11-03 11:08:49 UTC
(rev 1577)
+++ mrbs/branches/from_to_bookings/web/functions.inc 2010-11-03 11:12:05 UTC
(rev 1578)
@@ -179,6 +179,7 @@
if (is_float($dur))
{
$dur = sprintf('%.3f', $dur);
+ $dur = (string) (float) $dur; // removes trailing zeros
}
// Translate into local language if required
Property changes on: mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1491-1571
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1491-1577
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Achieve Improved Network Security with IP and DNS Reputation.
Defend against bad network traffic, including botnets, malware,
phishing sites, and compromised hosts - saving your company time,
money, and embarrassment. Learn More!
http://p.sf.net/sfu/hpdev2dev-nov
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
