Revision: 2722
https://sourceforge.net/p/mrbs/code/2722/
Author: cimorrison
Date: 2013-03-12 16:42:44 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/this_and_future/web/functions_ical.inc
mrbs/branches/this_and_future/web/mrbs_sql.inc
mrbs/branches/this_and_future/web/view_entry.php
Property Changed:
----------------
mrbs/branches/this_and_future/
Index: mrbs/branches/this_and_future
===================================================================
--- mrbs/branches/this_and_future 2013-03-12 16:36:31 UTC (rev 2721)
+++ mrbs/branches/this_and_future 2013-03-12 16:42:44 UTC (rev 2722)
Property changes on: mrbs/branches/this_and_future
___________________________________________________________________
Modified: svn:mergeinfo
## -12,4 +12,4 ##
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
-/mrbs/trunk:2708-2717
+/mrbs/trunk:2708-2721
\ No newline at end of property
Modified: mrbs/branches/this_and_future/web/functions_ical.inc
===================================================================
--- mrbs/branches/this_and_future/web/functions_ical.inc 2013-03-12
16:36:31 UTC (rev 2721)
+++ mrbs/branches/this_and_future/web/functions_ical.inc 2013-03-12
16:42:44 UTC (rev 2722)
@@ -1145,7 +1145,7 @@
// (We use PHP_INT_MAX rather than $max_rep_entrys because
$max_rep_entrys may
// have changed since the series was created.)
$rep_details = array();
- foreach (array('rep_type', 'rep_opt', 'rep_num_weeks',
'month_absolute') as $key)
+ foreach (array('rep_type', 'rep_opt', 'rep_num_weeks',
'month_absolute', 'month_relative') as $key)
{
if (isset($start_row[$key]))
{
Modified: mrbs/branches/this_and_future/web/mrbs_sql.inc
===================================================================
--- mrbs/branches/this_and_future/web/mrbs_sql.inc 2013-03-12 16:36:31 UTC
(rev 2721)
+++ mrbs/branches/this_and_future/web/mrbs_sql.inc 2013-03-12 16:42:44 UTC
(rev 2722)
@@ -717,7 +717,7 @@
$month++;
}
}
- else
+ elseif (isset($rep_details['month_relative']))
{
$day = byday_to_day($year, $month, $rep_details['month_relative']);
while (($day === FALSE) || (($day < $start_dom) && ($month ==
$start_month)))
@@ -726,6 +726,10 @@
$day = byday_to_day($year, $month, $rep_details['month_relative']);
}
}
+ else
+ {
+ trigger_error("No monthly repeat type, E_USER_WARNING");
+ }
trimToEndOfMonth($month, $day, $year);
break;
default:
Modified: mrbs/branches/this_and_future/web/view_entry.php
===================================================================
--- mrbs/branches/this_and_future/web/view_entry.php 2013-03-12 16:36:31 UTC
(rev 2721)
+++ mrbs/branches/this_and_future/web/view_entry.php 2013-03-12 16:42:44 UTC
(rev 2722)
@@ -232,7 +232,7 @@
if ($time_subset != THIS_ENTRY)
{
// If it's a series we want the repeat information
- $sql .= ", T.rep_type, T.end_date, T.rep_opt, T.rep_num_weeks";
+ $sql .= ", T.rep_type, T.end_date, T.rep_opt, T.rep_num_weeks,
T.month_absolute, T.month_relative";
}
$sql .= " FROM $tbl_area A, $tbl_room R, $tbl_entry E";
if ($time_subset != THIS_ENTRY)
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
