delete $md (event-links) because event ID is used

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 6da885117a344c4133d3cf2e1b9127553b3b9ae8..feb7533010ce8a64341d8174c6ad7dfc7d814b89 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -18,7 +18,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
 define ( 'FRIENDICA_VERSION',      '3.4.0' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1182      );
+define ( 'DB_UPDATE_VERSION',      1184      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
@@ -1695,7 +1695,6 @@ if(! function_exists('profile_sidebar')) {
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
 
-
                $tpl = get_markup_template('profile_vcard.tpl');
                $o .= replace_macros($tpl, array(
                        '$profile' => $p,
@@ -1853,15 +1852,14 @@ if(! function_exists('get_events')) {
                        $skip = 0;
 
                        foreach($r as &$rr) {
-                               if($rr['adjust'])
-                                       $md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m');
-                               else
-                                       $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m');
-                               $md .= "/#link-".$rr['id'];
+                               $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
+
+                               if(strlen($title) > 35)
+                                       $title = substr($title,0,32) . '... ';
 
-                               $title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
-                               if(! $title)
-                                       $title = t('[No description]');
+                               $description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
+                               if(! $description)
+                                       $description = t('[No description]');
 
                                $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
 
@@ -1871,9 +1869,9 @@ if(! function_exists('get_events')) {
                                }
 
                                $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
-
-                               $rr['link'] = $md;
+                               
                                $rr['title'] = $title;
+                               $rr['description'] = $desciption;
                                $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
                                $rr['startime'] = $strt;
                                $rr['today'] = $today;