diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-11-20 14:38:32 -0800 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-20 14:38:32 -0800 |
commit | 106b4fdd2d4b0cf893d27df7d60085b441f37b9a (patch) | |
tree | 54e6c412710c0ba0dbc3423b62ad99479822f36b /mod | |
parent | d9ddf7561f34ca4e83834e9144d2a4f25bc9fa0a (diff) | |
download | volse-hubzilla-106b4fdd2d4b0cf893d27df7d60085b441f37b9a.tar.gz volse-hubzilla-106b4fdd2d4b0cf893d27df7d60085b441f37b9a.tar.bz2 volse-hubzilla-106b4fdd2d4b0cf893d27df7d60085b441f37b9a.zip |
add v4 project roadmap, partial fix for cloning of profile photos on alternate profiles
Diffstat (limited to 'mod')
-rw-r--r-- | mod/profile_photo.php | 3 | ||||
-rw-r--r-- | mod/profiles.php | 16 |
2 files changed, 15 insertions, 4 deletions
diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 7067a9f76..2884505f0 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -6,6 +6,7 @@ */ require_once('include/photo/photo_driver.php'); +require_once('include/identity.php'); /* @brief Function for sync'ing permissions of profile-photos and their profile * @@ -195,6 +196,8 @@ function profile_photo_post(&$a) { ); } + profiles_build_sync(local_channel()); + // We'll set the updated profile-photo timestamp even if it isn't the default profile, // so that browsers will do a cache update unconditionally diff --git a/mod/profiles.php b/mod/profiles.php index 19e5ffc50..282d741ac 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -1,5 +1,6 @@ <?php +require_once('include/identity.php'); function profiles_init(&$a) { @@ -37,6 +38,12 @@ function profiles_init(&$a) { if($r) info( t('Profile deleted.') . EOL); + // @fixme this is a much more complicated sync - add any changed abook entries and + // also add deleted flag to profile structure + // profiles_build_sync is just here as a placeholder - it doesn't work at all here + + // profiles_build_sync(local_channel()); + goaway($a->get_baseurl(true) . '/profiles'); return; // NOTREACHED } @@ -118,7 +125,10 @@ function profiles_init(&$a) { dbesc($name) ); info( t('New profile created.') . EOL); - if(count($r3) == 1) + + profiles_build_sync(local_channel()); + + if(($r3) && (count($r3) == 1)) goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl(true) . '/profiles'); @@ -193,7 +203,6 @@ function profiles_post(&$a) { $namechanged = false; - call_hooks('profile_post', $_POST); // import from json export file. // Only import fields that are allowed on this hub @@ -220,6 +229,7 @@ function profiles_post(&$a) { } } + call_hooks('profile_post', $_POST); if((argc() > 1) && (argv(1) !== "new") && intval(argv(1))) { @@ -564,8 +574,6 @@ function profiles_post(&$a) { } - - function profiles_content(&$a) { $o = ''; |