Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
date_ical
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
drupal.org
date_ical
Commits
df3d0bd9
Commit
df3d0bd9
authored
Dec 24, 2015
by
Robert Rollins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #2638998: Fixed a rarely triggered bug with the indefinite recurring event workaround.
parent
579a1b3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
libraries/ParserVcalendar.inc
libraries/ParserVcalendar.inc
+9
-2
No files found.
libraries/ParserVcalendar.inc
View file @
df3d0bd9
...
...
@@ -472,7 +472,7 @@ class ParserVcalendar {
$msg
=
"The event with UID %uid has an indefinitely repeating RRULE, which the Date Repeat module doesn't support.
As a workaround, Date iCal set the repeat count to @count. This value can be customized in the iCal parser settings."
;
watchdog
(
'date_ical'
,
$msg
,
array
(
'%uid'
=>
$uid
,
'@count'
=>
$count
),
WATCHDOG_WARNING
);
if
(
$this
->
config
[
'indefinite_message_display'
]
)
{
if
(
!
empty
(
$this
->
config
[
'indefinite_message_display'
])
)
{
drupal_set_message
(
t
(
"At least one of the events in this iCal feed has an indefinitely repeating RRULE, which the Date Repeat module doesn't support.<br>
As a workaround, Date iCal set the repeat count to @count. This value can be customized in the iCal parser settings."
,
...
...
@@ -481,7 +481,14 @@ class ParserVcalendar {
FALSE
);
}
$rrule_data
[
'value'
][
'COUNT'
]
=
$this
->
config
[
'indefinite_count'
];
if
(
isset
(
$this
->
config
[
'indefinite_count'
]))
{
$rrule_data
[
'value'
][
'COUNT'
]
=
$this
->
config
[
'indefinite_count'
];
}
else
{
// Somehow, it's possible for the config values to have no setting, even though we've given them a default.
// So make really sure we set the COUNT to *something*.
$rrule_data
[
'value'
][
'COUNT'
]
=
52
;
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment