Merge pull request #3861 from annando/direct-forum-post

[friendica.git] / mod / cal.php

diff --git a/mod/cal.php b/mod/cal.php
index f43a4e8a70b647d13501bf276033970f4d1bb0cf..a130e7a30f81de33c380c8a347d9d741da6f6865 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -6,6 +6,9 @@
  *     of the profile owner
  */
 
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once('include/event.php');
 require_once('include/redir.php');
 
@@ -76,7 +79,7 @@ function cal_content(App $a) {
 
        $htpl = get_markup_template('event_head.tpl');
        $a->page['htmlhead'] .= replace_macros($htpl,array(
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::baseUrl(),
                '$module_url' => '/cal/' . $a->data['user']['nickname'],
                '$modparams' => 2,
                '$i18n' => $i18n,
@@ -84,7 +87,7 @@ function cal_content(App $a) {
 
        $etpl = get_markup_template('event_end.tpl');
        $a->page['end'] .= replace_macros($etpl,array(
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::baseUrl(),
        ));
 
        $o ="";
@@ -226,7 +229,7 @@ function cal_content(App $a) {
                        foreach ($r as $rr) {
                                $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
                                if (! x($links,$j)) {
-                                       $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+                                       $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
                                }
                        }
                }
@@ -265,12 +268,12 @@ function cal_content(App $a) {
                }
 
                $o = replace_macros($tpl, array(
-                       '$baseurl'      => App::get_baseurl(),
+                       '$baseurl'      => System::baseUrl(),
                        '$tabs'         => $tabs,
                        '$title'        => t('Events'),
                        '$view'         => t('View'),
-                       '$previous'     => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-                       '$next'         => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
+                       '$previous'     => array(System::baseUrl()."/events/$prevyear/$prevmonth", t('Previous'),'',''),
+                       '$next'         => array(System::baseUrl()."/events/$nextyear/$nextmonth", t('Next'),'',''),
                        '$calendar' => cal($y,$m,$links, ' eventcal'),
 
                        '$events'       => $events,