harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	index.php
	mod/setup.php
This commit is contained in:
redmatrix
2015-05-24 15:50:05 -07:00
parent 5795e2a58b 1354616787
commit 851f2f64df
29 changed files with 19946 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/dir_fns.php
View File

@@ -425,10 +425,13 @@ function local_dir_update($uid, $force) {
);
}
$arr = array('channel_id' => $uid, 'hash' => $hash, 'profile' => $profile);
call_hooks('local_dir_update', $arr);
$address = $p[0]['channel_address'] . '@' . get_app()->get_hostname();
if (perm_is_allowed($uid, '', 'view_profile')) {
import_directory_profile($hash, $profile, $address, 0);
import_directory_profile($hash, $arr['profile'], $address, 0);
} else {
// they may have made it private
$r = q("delete from xprof where xprof_hash = '%s'",