keith/friendica
1
0
Fork 0
Code Issues Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/bookmarklet.php
View file

@ -26,7 +26,7 @@ function bookmarklet_content(App $a)
return $o; return $o;
} }
$referer = normalise_link($_SERVER["HTTP_REFERER"]); $referer = normalise_link(defaults($_SERVER, 'HTTP_REFERER', ''));
$page = normalise_link(System::baseUrl() . "/bookmarklet"); $page = normalise_link(System::baseUrl() . "/bookmarklet");
if (!strstr($referer, $page)) { if (!strstr($referer, $page)) {
@ -43,7 +43,7 @@ function bookmarklet_content(App $a)
'bang' => '', 'bang' => '',
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), 'profile_uid' => local_user(),
'title' => trim($_REQUEST["title"], "*"), 'title' => trim(defaults($_REQUEST, 'title', ''), "*"),
'content' => $content 'content' => $content
]; ];
$o = status_editor($a, $x, 0, false); $o = status_editor($a, $x, 0, false);

4
mod/item.php
View file

@ -395,12 +395,12 @@ function item_post(App $a) {
$tagged[] = $tag; $tagged[] = $tag;
} }
// When the forum is private or the forum is addressed with a "!" make the post private // When the forum is private or the forum is addressed with a "!" make the post private
if (is_array($success['contact']) && ($success['contact']['prv'] || ($tag_type == '!'))) { if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == '!'))) {
$private_forum = $success['contact']['prv']; $private_forum = $success['contact']['prv'];
$only_to_forum = ($tag_type == '!'); $only_to_forum = ($tag_type == '!');
$private_id = $success['contact']['id']; $private_id = $success['contact']['id'];
$forum_contact = $success['contact']; $forum_contact = $success['contact'];
} elseif (is_array($success['contact']) && $success['contact']['forum'] && } elseif (is_array($success['contact']) && !empty($success['contact']['forum']) &&
($str_contact_allow == '<' . $success['contact']['id'] . '>')) { ($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
$private_forum = false; $private_forum = false;
$only_to_forum = true; $only_to_forum = true;

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')]; $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
// Don't show notifications for public communities // 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['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')];
$nav['notifications'] = ['notifications', L10n::t('Notifications'), '', L10n::t('Notifications')]; $nav['notifications'] = ['notifications', L10n::t('Notifications'), '', L10n::t('Notifications')];
$nav['notifications']['all'] = ['notifications/system', L10n::t('See all 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() { public static function getHTML() {
$a = get_app(); $a = get_app();
if (empty($a->data['user'])) {
return;
}
$owner_uid = $a->data['user']['uid']; $owner_uid = $a->data['user']['uid'];
// The permission testing is a little bit tricky because we have to respect many cases. // The permission testing is a little bit tricky because we have to respect many cases.

2
view/theme/frio/templates/profile_edit.tpl
View file

@ -318,8 +318,10 @@
<input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" /> <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
<input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" /> <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
<input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" /> <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
<input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.2}}" />
<input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" /> <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
<input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" /> <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
<input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.2}}" />
<input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" /> <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
<input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" /> <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
<input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" /> <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />