harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	util/messages.po
This commit is contained in:
redmatrix
2015-07-31 15:45:13 -07:00
parent 1d218784d1 5e985ef34f
commit c1a953f960
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/event.php
View File

@@ -18,6 +18,7 @@ function format_event_html($ev) {
if(! ((is_array($ev)) && count($ev)))
return '';
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
$o = '<div class="vevent">' . "\r\n";
@@ -165,7 +166,18 @@ function bbtoevent($s) {
$match = '';
if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
$ev['adjust'] = $match[1];
$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
if(array_key_exists('start',$ev)) {
if(array_key_exists('finish',$ev)) {
if($ev['finish'] === $ev['start'])
$ev['nofinish'] = 1;
elseif($ev['finish'])
$ev['nofinish'] = 0;
else
$ev['nofinish'] = 1;
}
else
$ev['nofinish'] = 1;
}
return $ev;
}
@@ -483,7 +495,7 @@ function event_import_ical($ical, $uid) {
$ev['private'] = 1;
$ev['allow_cid'] = '<' . $channel['channel_hash'] . '>';
// logger('storing event: ' . print_r($ev,true), LOGGER_ALL);
logger('storing event: ' . print_r($ev,true), LOGGER_ALL);
$event = event_store_event($ev);
if($event) {
$item_id = event_store_item($ev,$event);