mirror of
https://gitlab.com/davical-project/davical.git
synced 2026-01-27 00:33:34 +00:00
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/davical
Conflicts: inc/tz/get.php
This commit is contained in:
commit
adc9849bac
@ -45,8 +45,8 @@ if ( $qry->QDo('SELECT * FROM tz_localnames WHERE our_tzno = :our_tzno', array('
|
||||
|
||||
header( 'ETag: "'.$tz->etag.'"' );
|
||||
header( 'Last-Modified', $tz->last_modified );
|
||||
header( 'Content-Disposition', 'Attachment; Filename="'.str_replace('/','-',$tzid . '.ics"' );
|
||||
header( 'Content-Disposition', 'Attachment; Filename="'.str_replace('/','-',$tzid . '.ics"' ));
|
||||
|
||||
$request->DoResponse(200, $vtz->Render(), 'text/calendar; charset=UTF-8');
|
||||
|
||||
exit(0);
|
||||
exit(0);
|
||||
|
||||
@ -13,5 +13,5 @@ TZDATAFILE="`ls -t tzdata*.tar.gz|tail -n 1`"
|
||||
mkdir tzdata && cd tzdata && tar -xfz ../$TZDATAFILE
|
||||
)
|
||||
|
||||
vzic --olson-dir tzdata --output-dir vtimezones
|
||||
vzic --pure --olson-dir tzdata --output-dir vtimezones
|
||||
echo "Olson `echo $TZDATAFILE | cut -f1 -d.`" >vtimezones/primary-source
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user