Revision: 1444
http://mrbs.svn.sourceforge.net/mrbs/?rev=1444&view=rev
Author: cimorrison
Date: 2010-09-05 12:38:28 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/internalconfig.inc.php
mrbs/branches/provisional_bookings_new_style/web/lang.en
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-1439
+ /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-1443
Modified:
mrbs/branches/provisional_bookings_new_style/web/internalconfig.inc.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/internalconfig.inc.php
2010-09-05 12:30:52 UTC (rev 1443)
+++ mrbs/branches/provisional_bookings_new_style/web/internalconfig.inc.php
2010-09-05 12:38:28 UTC (rev 1444)
@@ -95,14 +95,31 @@
/********************************************************
* Miscellaneous
********************************************************/
- // Save some of the default per-area settings for later use. We
- // do this because they will get overwritten by the values for
- // the current area in a moment - in standard_vars.inc by a call to
- // get_area_settings(). [This isn't a very elegant way of handling
- // per-area settings and perhaps ought to be revisited at some stage]
- $area_defaults = array();
- $area_defaults['approval_enabled'] = $approval_enabled;
- $area_defaults['confirmation_enabled'] = $confirmation_enabled;
+// Save some of the default per-area settings for later use. We
+// do this because they will get overwritten by the values for
+// the current area in a moment - in standard_vars.inc by a call to
+// get_area_settings(). [This isn't a very elegant way of handling
+// per-area settings and perhaps ought to be revisited at some stage]
+
+$area_defaults = array();
+$area_defaults['resolution'] = $resolution;
+$area_defaults['default_duration'] = $default_duration;
+$area_defaults['morningstarts'] = $morningstarts;
+$area_defaults['morningstarts_minutes'] = $morningstarts_minutes;
+$area_defaults['eveningends'] = $eveningends;
+$area_defaults['eveningends_minutes'] = $eveningends_minutes;
+$area_defaults['private_enabled'] = $private_enabled;
+$area_defaults['private_default'] = $private_default;
+$area_defaults['private_mandatory'] = $private_mandatory;
+$area_defaults['private_override'] = $private_override;
+$area_defaults['min_book_ahead_enabled'] = $min_book_ahead_enabled;
+$area_defaults['max_book_ahead_enabled'] = $max_book_ahead_enabled;
+$area_defaults['min_book_ahead_secs'] = $min_book_ahead_secs;
+$area_defaults['max_book_ahead_secs'] = $max_book_ahead_secs;
+$area_defaults['provisional_enabled'] = $provisional_enabled;
+$area_defaults['reminders_enabled'] = $reminders_enabled;
+$area_defaults['approval_enabled'] = $approval_enabled;
+$area_defaults['confirmation_enabled'] = $confirmation_enabled;
/********************************************************
* PHP System Configuration - internal use, do not change
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.en
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.en 2010-09-05
12:30:52 UTC (rev 1443)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.en 2010-09-05
12:38:28 UTC (rev 1444)
@@ -175,7 +175,7 @@
// Database upgrade code
$vocab["database_login"] = "Database login";
-$vocab["upgrade_required"] = "The database needs to be upgraded.";
+$vocab["upgrade_required"] = "The database needs to be upgraded.
Please backup your database before proceeding.";
$vocab["supply_userpass"] = "Please supply a database username and
password that has admin rights.";
$vocab["contact_admin"] = "If you are not the MRBS administrator
please contact $mrbs_admin.";
$vocab["upgrade_to_version"] = "Upgrading to database version";
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-1439
+ /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-1443
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
