Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 17:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

And again, and again, and again, ... some more notices removed (#5601)

Browse source 
* And again, and again, and again, ... some more notices removed

* And some more notices ...

* Some more place
This commit is contained in:
Michael Vogel 2018-08-11 23:05:42 +02:00 • committed by Hypolite Petovan
parent e06fc2aa69
commit 880b7177c8
5 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Nav.php
View file

@ -186,7 +186,7 @@ class Nav
$nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
// Don't show notifications for public communities
if ($_SESSION['page_flags'] != Contact::PAGE_COMMUNITY) {
if (defaults($_SESSION, 'page_flags', '') != Contact::PAGE_COMMUNITY) {
$nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')];
$nav['notifications'] = ['notifications', L10n::t('Notifications'), '', L10n::t('Notifications')];
$nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', ''];

4
src/Content/Widget/CalendarExport.php
View file

@ -27,6 +27,10 @@ class CalendarExport
public static function getHTML() {
$a = get_app();
if (empty($a->data['user'])) {
return;
}
$owner_uid = $a->data['user']['uid'];
// The permission testing is a little bit tricky because we have to respect many cases.