diff options
| author | zotlabs <mike@macgirvin.com> | 2017-01-01 14:16:15 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-01-01 14:16:15 -0800 |
| commit | dca4de80fd8dfc2e23f6e7bec73b8bf79cdfa8ca (patch) | |
| tree | c3c0f125f11a7f7e916384779ba279d08b2fc7ce /Zotlabs | |
| parent | 1436b075bfbf6a2f4abaddfd9d124153004bc45f (diff) | |
| parent | bead3e6095066990afe982fc63e86f2bbd4d109f (diff) | |
| download | volse-hubzilla-dca4de80fd8dfc2e23f6e7bec73b8bf79cdfa8ca.tar.gz volse-hubzilla-dca4de80fd8dfc2e23f6e7bec73b8bf79cdfa8ca.tar.bz2 volse-hubzilla-dca4de80fd8dfc2e23f6e7bec73b8bf79cdfa8ca.zip | |
Merge branch 'pcard' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Profiles.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index a1689e6ed..72a056963 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -243,6 +243,7 @@ class Profiles extends \Zotlabs\Web\Controller { check_form_security_token_redirectOnErr('/profiles', 'profile_edit'); + $is_default = (($orig[0]['is_default']) ? 1 : 0); $profile_name = notags(trim($_POST['profile_name'])); @@ -315,6 +316,15 @@ class Profiles extends \Zotlabs\Web\Controller { $hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0); + + $orig_vcard = (($orig[0]['profile_vcard']) ? \Sabre\VObject\Reader::read($orig[0]['profile_vcard']) : null); + + $_REQUEST['fn'] = $name; + $_REQUEST['title'] = $pdesc; + + $profile_vcard = update_vcard($_REQUEST,$orig_vcard); + + require_once('include/text.php'); linkify_tags($a, $likes, local_channel()); linkify_tags($a, $dislikes, local_channel()); @@ -511,7 +521,8 @@ class Profiles extends \Zotlabs\Web\Controller { romance = '%s', employment = '%s', education = '%s', - hide_friends = %d + hide_friends = %d, + profile_vcard = '%s' WHERE id = %d AND uid = %d", dbesc($profile_name), dbesc($name), @@ -546,6 +557,7 @@ class Profiles extends \Zotlabs\Web\Controller { dbesc($work), dbesc($education), intval($hide_friends), + dbesc($profile_vcard), intval(argv(1)), intval(local_channel()) ); |