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

Resolving merge conflict

Browse Source
This commit is contained in:
Haakon Meland Eriksen
2015-11-29 11:55:39 +01:00
parent 8cf6b4064f
commit 4d97ea106c
9 changed files with 49 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
include/text.php
View File

@@ -1444,62 +1444,11 @@ function prepare_body(&$item,$attach = false) {
}
}
<<<<<<< HEAD
$event = array();
$is_event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? true : false);
if($is_event) {
$object = json_decode($item['object'],true);
//ensure compatibility with older items
if(array_key_exists('description', $object)) {
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
$event['header'] = '<div class="event-title"><h3><i class="icon-calendar"></i>&nbsp;' . bbcode($object['title']) . '</h3></div>' . "\r\n";
$event['header'] .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
. datetime_convert('UTC', 'UTC', $object['start'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
. '" >'
. (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
$object['start'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$object['start'] , $bd_format)))
. '</span></div>' . "\r\n";
if(! $object['nofinish'])
$event['header'] .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
. datetime_convert('UTC','UTC',$object['finish'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
. '" >'
. (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
$object['finish'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$object['finish'] , $bd_format )))
. '</span></div>' . "\r\n";
$event['content'] = '<div class="event-description">' . bbcode($object['description']) . '</div>' . "\r\n";
if(strlen($object['location']))
$event['content'] .= '<div class="event-location"><span class="event-label"> ' . t('Location:') . '</span>&nbsp;<span class="location">'
. bbcode($object['location'])
. '</span></div>' . "\r\n";
}
else {
$is_event = false;
}
}
$prep_arr = array(
'item' => $item,
'html' => $is_event ? $event['content'] : $s,
=======
$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event($item['object']) : false);
$prep_arr = array(
'item' => $item,
'html' => $event ? $event['content'] : $s,
>>>>>>> upstream/master
'event' => $event['header'],
'photo' => $photo
);