diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-30 22:13:24 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-30 22:13:24 -0700 |
| commit | 1cd3b4182595b838a535dd6b6990251db05d49e6 (patch) | |
| tree | 2d22ab3140caf9d7efcd46a1f30f81a833ebf6fd /mod/cal.php | |
| parent | 4148211086ff53dfb6fb4e969fd067389bcfef29 (diff) | |
| download | volse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.tar.gz volse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.tar.bz2 volse-hubzilla-1cd3b4182595b838a535dd6b6990251db05d49e6.zip | |
deprecate $a->get_baseurl()
Diffstat (limited to 'mod/cal.php')
| -rwxr-xr-x | mod/cal.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mod/cal.php b/mod/cal.php index 453f46f69..80a484c27 100755 --- a/mod/cal.php +++ b/mod/cal.php @@ -71,7 +71,7 @@ function cal_content(&$a) { $htpl = get_markup_template('event_head.tpl'); $a->page['htmlhead'] .= replace_macros($htpl,array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$module_url' => '/cal/' . $channel['channel_address'], '$modparams' => 2, '$lang' => $a->language, @@ -243,7 +243,7 @@ function cal_content(&$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] = $a->get_baseurl() . '/' . $a->cmd . '#link-' . $j; + $links[$j] = z_root() . '/' . $a->cmd . '#link-' . $j; } } @@ -321,11 +321,11 @@ function cal_content(&$a) { $nick = $channel['channel_address']; $o = replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(), - '$new_event' => array($a->get_baseurl().'/cal',(($event_id) ? t('Edit Event') : t('Create Event')),'',''), - '$previus' => array($a->get_baseurl()."/cal/$nick/$prevyear/$prevmonth",t('Previous'),'',''), - '$next' => array($a->get_baseurl()."/cal/$nick/$nextyear/$nextmonth",t('Next'),'',''), - '$export' => array($a->get_baseurl()."/cal/$nick/$y/$m/export",t('Export'),'',''), + '$baseurl' => z_root(), + '$new_event' => array(z_root().'/cal',(($event_id) ? t('Edit Event') : t('Create Event')),'',''), + '$previus' => array(z_root()."/cal/$nick/$prevyear/$prevmonth",t('Previous'),'',''), + '$next' => array(z_root()."/cal/$nick/$nextyear/$nextmonth",t('Next'),'',''), + '$export' => array(z_root()."/cal/$nick/$y/$m/export",t('Export'),'',''), '$calendar' => cal($y,$m,$links, ' eventcal'), '$events' => $events, '$upload' => t('Import'), |