diff options
| author | Max Kostikov <max@kostikov.co> | 2020-02-24 12:10:00 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-02-24 12:10:00 +0100 |
| commit | 16738dfe7fe664f0eea51b508473e4bb753de683 (patch) | |
| tree | 57b8bbfbb2ebf8742f1415a234d4eef3f80506e3 | |
| parent | b36eb9a91cba1a6f3a53961f895665a0ae110b95 (diff) | |
| parent | c28ba4be37bdce7bd0c0f5fd729b6ff951f741fd (diff) | |
| download | volse-hubzilla-16738dfe7fe664f0eea51b508473e4bb753de683.tar.gz volse-hubzilla-16738dfe7fe664f0eea51b508473e4bb753de683.tar.bz2 volse-hubzilla-16738dfe7fe664f0eea51b508473e4bb753de683.zip | |
Merge branch 'dev' into 'dev'
Minor cdav related changes
See merge request hubzilla/core!1836
| -rw-r--r-- | Zotlabs/Module/Well_known.php | 5 | ||||
| -rw-r--r-- | include/cdav.php | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Zotlabs/Module/Well_known.php b/Zotlabs/Module/Well_known.php index 140ab260d..0d7b222b8 100644 --- a/Zotlabs/Module/Well_known.php +++ b/Zotlabs/Module/Well_known.php @@ -65,11 +65,6 @@ class Well_known extends \Zotlabs\Web\Controller { killme(); case 'caldav': - if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') { - http_status('301', 'moved permanently'); - goaway(z_root() . '/cdav'); - }; - case 'carddav': if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') { http_status('301', 'moved permanently'); diff --git a/include/cdav.php b/include/cdav.php index cdf7775db..ef248a9fe 100644 --- a/include/cdav.php +++ b/include/cdav.php @@ -3,7 +3,7 @@ /** * @brief Process CardDAV card * - * @param array $f fields array + * @param array $f fields * @param obj $vcard SabreDAV object * @param bool $edit update card * @@ -96,7 +96,7 @@ function process_cdav_card($f, &$vcard, $edit = false) { /** * @brief Import CardDAV or CalDAV card * - * @param int $id card id + * @param mixed $id card id * @param str $ext card extension * @param str $table name * @param str $column name |