Revision: 1557
http://mrbs.svn.sourceforge.net/mrbs/?rev=1557&view=rev
Author: cimorrison
Date: 2010-10-26 14:37:18 +0000 (Tue, 26 Oct 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
Property Changed:
----------------
mrbs/branches/provisional_bookings_new_style/
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/provisional_bookings_new_style
___________________________________________________________________
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/trunk:1407-1553
+ /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/trunk:1407-1556
Modified: mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
2010-10-26 14:35:00 UTC (rev 1556)
+++ mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
2010-10-26 14:37:18 UTC (rev 1557)
@@ -332,7 +332,7 @@
$area_confirmation_enabled = (!empty($area_confirmation_enabled)) ? 1 : 0;
$area_confirmed_default = (!empty($area_confirmed_default)) ? 1 : 0;
- if (!$enable_periods)
+ if (!$area_enable_periods)
{
// Avoid divide by zero errors
if ($area_res_mins == 0)
@@ -368,7 +368,7 @@
$assign_array[] = "area_name='" . addslashes($area_name) . "'";
$assign_array[] = "area_admin_email='" . addslashes($area_admin_email) .
"'";
$assign_array[] = "custom_html='" . addslashes($custom_html) . "'";
- if (!$enable_periods)
+ if (!$area_enable_periods)
{
// only update the min and max book_ahead_secs fields if the form
values
// are set; they might be NULL because they've been disabled by
JavaScript
Property changes on:
mrbs/branches/provisional_bookings_new_style/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/trunk/web/upgrade/5/pgsql.sql:1407-1553
+ /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/trunk/web/upgrade/5/pgsql.sql:1407-1556
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
