aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-29 10:07:15 +0100
committerMario Vavti <mario@mariovavti.com>2018-10-29 10:07:15 +0100
commit31883f603cbbe38183f365954c3093b545cfb413 (patch)
tree8461b709f5f1df4fe2fca05a8741c9d49026e02d /include
parentf377c81c8a0394ada05d2302f4c806f2e635a30b (diff)
downloadvolse-hubzilla-31883f603cbbe38183f365954c3093b545cfb413.tar.gz
volse-hubzilla-31883f603cbbe38183f365954c3093b545cfb413.tar.bz2
volse-hubzilla-31883f603cbbe38183f365954c3093b545cfb413.zip
merge include/import.php from dev
Diffstat (limited to 'include')
-rw-r--r--include/import.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/import.php b/include/import.php
index 19e2bbcec..714161c57 100644
--- a/include/import.php
+++ b/include/import.php
@@ -168,7 +168,6 @@ function import_profiles($channel, $profiles) {
unset($profile['id']);
$profile['aid'] = get_account_id();
$profile['uid'] = $channel['channel_id'];
- unset($profile['profile_vcard']);
convert_oldfields($profile,'name','fullname');
convert_oldfields($profile,'with','partner');