Revision: 2018
http://mrbs.svn.sourceforge.net/mrbs/?rev=2018&view=rev
Author: cimorrison
Date: 2011-09-27 11:22:15 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/datatables/web/day.php
mrbs/branches/datatables/web/del_entry.php
mrbs/branches/datatables/web/edit_entry.php
mrbs/branches/datatables/web/month.php
mrbs/branches/datatables/web/week.php
Property Changed:
----------------
mrbs/branches/datatables/
mrbs/branches/datatables/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/datatables
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/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:1863-2015
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/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:1863-2017
Modified: mrbs/branches/datatables/web/day.php
===================================================================
--- mrbs/branches/datatables/web/day.php 2011-09-27 11:17:53 UTC (rev
2017)
+++ mrbs/branches/datatables/web/day.php 2011-09-27 11:22:15 UTC (rev
2018)
@@ -9,11 +9,6 @@
$timetohighlight = get_form_var('timetohighlight', 'int');
$debug_flag = get_form_var('debug_flag', 'int');
-if (empty($debug_flag))
-{
- $debug_flag = 0;
-}
-
// Check the user is authorised for this page
checkAuthorised();
Modified: mrbs/branches/datatables/web/del_entry.php
===================================================================
--- mrbs/branches/datatables/web/del_entry.php 2011-09-27 11:17:53 UTC (rev
2017)
+++ mrbs/branches/datatables/web/del_entry.php 2011-09-27 11:22:15 UTC (rev
2018)
@@ -16,16 +16,11 @@
$series = get_form_var('series', 'int');
$returl = get_form_var('returl', 'string');
$action = get_form_var('action', 'string');
-$note = get_form_var('note', 'string');
+$note = get_form_var('note', 'string', '');
// Check the user is authorised for this page
checkAuthorised();
-if (!isset($note))
-{
- $note = "";
-}
-
if (empty($returl))
{
switch ($default_view)
Modified: mrbs/branches/datatables/web/edit_entry.php
===================================================================
--- mrbs/branches/datatables/web/edit_entry.php 2011-09-27 11:17:53 UTC (rev
2017)
+++ mrbs/branches/datatables/web/edit_entry.php 2011-09-27 11:22:15 UTC (rev
2018)
@@ -127,13 +127,9 @@
$period = get_form_var('period', 'int');
$id = get_form_var('id', 'int');
$copy = get_form_var('copy', 'int');
-$edit_type = get_form_var('edit_type', 'string');
+$edit_type = get_form_var('edit_type', 'string', '');
$returl = get_form_var('returl', 'string');
-if (!isset($edit_type))
-{
- $edit_type = "";
-}
// We might be going through edit_entry more than once, for example if we have
to log on on the way. We
// still need to preserve the original calling page so that once we've
completed edit_entry_handler we can
Modified: mrbs/branches/datatables/web/month.php
===================================================================
--- mrbs/branches/datatables/web/month.php 2011-09-27 11:17:53 UTC (rev
2017)
+++ mrbs/branches/datatables/web/month.php 2011-09-27 11:22:15 UTC (rev
2018)
@@ -22,12 +22,6 @@
return "> ";
}
-// Default parameters:
-if (empty($debug_flag))
-{
- $debug_flag = 0;
-}
-
// Check the user is authorised for this page
checkAuthorised();
Property changes on: mrbs/branches/datatables/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/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/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:1863-2015
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/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:1863-2017
Modified: mrbs/branches/datatables/web/week.php
===================================================================
--- mrbs/branches/datatables/web/week.php 2011-09-27 11:17:53 UTC (rev
2017)
+++ mrbs/branches/datatables/web/week.php 2011-09-27 11:22:15 UTC (rev
2018)
@@ -11,11 +11,6 @@
$debug_flag = get_form_var('debug_flag', 'int');
$timetohighlight = get_form_var('timetohighlight', 'int');
-if (empty($debug_flag))
-{
- $debug_flag = 0;
-}
-
// Check the user is authorised for this page
checkAuthorised();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
