diff options
| author | Hilmar R <u02@u29lx193> | 2021-01-22 01:38:43 +0100 |
|---|---|---|
| committer | Hilmar R <u02@u29lx193> | 2021-01-22 01:38:43 +0100 |
| commit | 523765b968a5d94a98eee12854fc527d5abbc2e7 (patch) | |
| tree | a71caba8943c674917821a4afd333eb39ac92b2e /include/cdav.php | |
| parent | 78f150cfbc1b713bfba3101fdc3f1fd624120637 (diff) | |
| parent | 254e30bea173e350a24756cbd8cf4acdfe32933e (diff) | |
| download | volse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.tar.gz volse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.tar.bz2 volse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.zip | |
Merge branch 'master' into air.5
Diffstat (limited to 'include/cdav.php')
| -rw-r--r-- | include/cdav.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cdav.php b/include/cdav.php index ef248a9fe..fcce0ec4a 100644 --- a/include/cdav.php +++ b/include/cdav.php @@ -111,7 +111,7 @@ function process_cdav_card($f, &$vcard, $edit = false) { function import_cdav_card($id, $ext, $table, $column, $objects, $profile, $backend, &$ids, $notice = false) { $i = 0; - $newid = (count($ids) ? false : true); + $newid = (count($ids) ? false : true); while ($object = $objects->getNext()) { @@ -161,7 +161,7 @@ function import_cdav_card($id, $ext, $table, $column, $objects, $profile, $backe ); } - if($notice && $exp == 'vcf') { + if($notice && $ext == 'vcf') { notice( '<strong>' . t('INVALID CARD DISMISSED!') . '</strong>' . EOL . '<strong>' . t('Name: ') . '</strong>' . (($object->FN) ? $object->FN : t('Unknown')) . EOL . |