MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2639 from rabuzarus/2506_viewcontact_tabs

Browse source 
viewcontacts - make the tabbar available even if hide-friends is active
This commit is contained in:
Tobias Diekershoff 2016-06-25 19:48:35 +02:00 committed by GitHub
parent ce06b3ae4a 06959d745e
commit 6c22cb917a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/viewcontacts.php
View file

@ -36,16 +36,16 @@ function viewcontacts_content(&$a) {
return; return;
} }
if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
notice( t('Permission denied.') . EOL);
return;
}
$o = ""; $o = "";
// tabs // tabs
$o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']); $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
notice( t('Permission denied.') . EOL);
return;
}
$r = q("SELECT COUNT(*) AS `total` FROM `contact` $r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
AND `network` IN ('%s', '%s', '%s')", AND `network` IN ('%s', '%s', '%s')",

2
view/theme/frio/css/style.css
View file

@ -1770,7 +1770,7 @@ ul.dropdown-menu li:hover {
.allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
.message-content-wrapper, .apps-content-wrapper, .notifications-content-wrapper, .message-content-wrapper, .apps-content-wrapper, .notifications-content-wrapper,
.admin-content-wrapper, .group-content-wrapper { .admin-content-wrapper, .group-content-wrapper, .viewcontacts-content-wrapper {
min-height: calc(100vh - 150px); min-height: calc(100vh - 150px);
padding: 15px; padding: 15px;
padding-bottom: 20px; padding-bottom: 20px;