Revision: 1434
http://mrbs.svn.sourceforge.net/mrbs/?rev=1434&view=rev
Author: cimorrison
Date: 2010-09-01 15:05:00 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/systemdefaults.inc.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-1428
+ /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-1433
Modified:
mrbs/branches/provisional_bookings_new_style/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/systemdefaults.inc.php
2010-09-01 14:42:32 UTC (rev 1433)
+++ mrbs/branches/provisional_bookings_new_style/web/systemdefaults.inc.php
2010-09-01 15:05:00 UTC (rev 1434)
@@ -418,14 +418,15 @@
// Display checkbox in entry page to make
// the booking private.
-$private_default = FALSE; // DEFAULT VALUE FOR NEW AREAS
- // Set default value for "Private" flag on new/edited entries.
- // Used even if checkbox is not displayed.
-
$private_mandatory = FALSE; // DEFAULT VALUE FOR NEW AREAS
// If TRUE all new/edited entries will
// use the value from $private_default when saved.
// If checkbox is displayed it will be disabled.
+
+$private_default = FALSE; // DEFAULT VALUE FOR NEW AREAS
+ // Set default value for "Private" flag on new/edited entries.
+ // Used if the $private_enabled checkbox is displayed
+ // or if $private_mandatory is set.
$private_override = "none"; // DEFAULT VALUE FOR NEW AREAS
// Override default privacy behavior.
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-1428
+ /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-1433
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
