summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormodela bitweaver <spiderr@bitweaver.org>2021-01-31 16:26:10 -0500
committermodela bitweaver <spiderr@bitweaver.org>2021-01-31 16:26:10 -0500
commitc3b302935c790f584f61b830ea3540cebe3ab5af (patch)
tree1f65046ca9de323f37e5bd3797f5e371c06b5746
parente3a85d093069848b1d12bb6c148bacb5d75e16ec (diff)
downloadcalendar-c3b302935c790f584f61b830ea3540cebe3ab5af.tar.gz
calendar-c3b302935c790f584f61b830ea3540cebe3ab5af.tar.bz2
calendar-c3b302935c790f584f61b830ea3540cebe3ab5af.zip
PHP7 clean up dual static + object use of parseData, and create ->getParsedData & ::filterDataHash
-rw-r--r--Calendar.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Calendar.php b/Calendar.php
index 3a887ba..5b387d1 100644
--- a/Calendar.php
+++ b/Calendar.php
@@ -76,7 +76,7 @@ class Calendar extends LibertyContent {
$item['created'] = $item['created'] + $this->display_offset;
$item['last_modified'] = $item['last_modified'] + $this->display_offset;
$item['event_time'] = $item['event_time'] + $this->display_offset;
- $item['parsed'] = $this->parseData($item['data'], $item['format_guid']);
+ $item['parsed'] = self::parseDataHash( $item['data'] );
$dstart = $this->mDate->gmmktime( 0, 0, 0, $this->mDate->date( "m", $item['timestamp'], true ), $this->mDate->date( "d", $item['timestamp'], true ), $this->mDate->date( "Y", $item['timestamp'], true ) );
$ret[$dstart][] = $item;
}
@@ -419,7 +419,7 @@ class Calendar extends LibertyContent {
if( !empty( $bitEvents[$day['day']] ) ) {
$i = 0;
foreach( $bitEvents[$day['day']] as $bitEvent ) {
- $bitEvent['parsed_data'] = $this->parseData($bitEvent);
+ $bitEvent['parsed_data'] = self::parseDataHash($bitEvent);
$dayEvents[$i] = $bitEvent;
if (!$gBitSystem->isFeatureActive('calendar_ajax_popups')) {
$gBitSmarty->assign( 'cellHash', $bitEvent );