Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index 6a292a2c074778c8d67039e4feba0d47b211e594..73e61f25cf3949a20585aafc9dff55a172be6da2 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -206,7 +206,7 @@ function bbtoevent($s) {
 }
 
 
-function sort_by_date($a) {
+function sort_by_date(App &$a) {
 
        usort($a,'ev_compare');
        return $a;
@@ -408,7 +408,7 @@ function event_store($arr) {
                        intval($arr['uid'])
                );
                //if (dbm::is_result($r))
-               //      $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
+               //      $plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
                if($item_id) {
@@ -590,7 +590,7 @@ function process_events ($arr) {
                        $is_first = ($d !== $last_date);
 
                        $last_date = $d;
-                       $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
+                       $edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
                        $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
                        if(! $title) {
                                list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);