Commit 265db744 authored by Jonny Bradley's avatar Jonny Bradley

[FIX] user prefs: Allow messages to be sent via tiki-user_information.php if...

[FIX] user prefs: Allow messages to be sent via tiki-user_information.php if allowMsgs is on, even if user_information is set to private.
parent 680163b6
This diff is collapsed.
......@@ -44,14 +44,12 @@ if ($prefs['feature_friends'] == 'y') {
$smarty->assign('friend_pending', $tikilib->verify_friendship_request($userwatch, $user));
$smarty->assign('friend_waiting', $tikilib->verify_friendship_request($user, $userwatch));
}
$smarty->assign('infoPublic', 'y');
if ($tiki_p_admin != 'y') {
$user_information = $tikilib->get_user_preference($userwatch, 'user_information', 'public');
// If the user is trying to pull info on themselves, allow it.
if ($user_information == 'private' && $userwatch != $user) {
$smarty->assign('errortype', 'no_redirect_login');
$smarty->assign('msg', tra("The user has chosen to make his information private"));
$smarty->display("error.tpl");
die;
$smarty->assign('infoPublic', 'n');
}
}
if ($user) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment