diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-29 11:55:39 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-29 11:55:39 +0100 |
commit | 4d97ea106cf45f9dd191358dc6bde3a7fab438c1 (patch) | |
tree | 29b9954ebd4fe6beb0261fc65b57838cc07b7b66 /include/text.php | |
parent | 8cf6b4064fbea605eb01e02a8b0d9db8f1205946 (diff) | |
download | volse-hubzilla-4d97ea106cf45f9dd191358dc6bde3a7fab438c1.tar.gz volse-hubzilla-4d97ea106cf45f9dd191358dc6bde3a7fab438c1.tar.bz2 volse-hubzilla-4d97ea106cf45f9dd191358dc6bde3a7fab438c1.zip |
Resolving merge conflict
Diffstat (limited to 'include/text.php')
-rw-r--r-- | include/text.php | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/include/text.php b/include/text.php index 99c73ebee..4777e7a61 100644 --- a/include/text.php +++ b/include/text.php @@ -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> ' . bbcode($object['title']) . '</h3></div>' . "\r\n"; - - $event['header'] .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span> <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> <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> <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 ); |