strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8179 from MrPetovan/bug/notices

Browse source 
Various notice fixes
This commit is contained in:
Philipp 2020-01-26 23:10:56 +01:00 committed by GitHub
parent df61be84fc fb2f8dcb9c
commit 9827e933a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/api.php
View file

@ -312,9 +312,7 @@ function api_call(App $a, App\Arguments $args = null)
} }
$called_api = explode("/", $p); $called_api = explode("/", $p);
//unset($_SERVER['PHP_AUTH_USER']);
/// @TODO should be "true ==[=] $info['auth']", if you miss only one = character, you assign a variable (only with ==). Let's make all this even.
if (!empty($info['auth']) && api_user() === false) { if (!empty($info['auth']) && api_user() === false) {
api_login($a); api_login($a);
} }
@ -5028,6 +5026,9 @@ function prepare_photo_data($type, $scale, $photo_id)
// retrieve item element for getting activities (like, dislike etc.) related to photo // retrieve item element for getting activities (like, dislike etc.) related to photo
$condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo']; $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
$item = Item::selectFirstForUser(local_user(), ['id'], $condition); $item = Item::selectFirstForUser(local_user(), ['id'], $condition);
if (!DBA::isResult($item)) {
throw new NotFoundException('Photo-related item not found.');
}
$data['photo']['friendica_activities'] = api_format_items_activities($item, $type); $data['photo']['friendica_activities'] = api_format_items_activities($item, $type);

6
mod/display.php
View file

@ -96,10 +96,10 @@ function display_init(App $a)
$profiledata = display_fetchauthor($a, $item); $profiledata = display_fetchauthor($a, $item);
if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(DI::baseUrl()))) { if (strstr(Strings::normaliseLink($profiledata['url']), Strings::normaliseLink(DI::baseUrl()))) {
$nickname = str_replace(Strings::normaliseLink(DI::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"])); $nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url']));
if ($nickname != $a->user["nickname"]) { if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) {
$profile = DBA::fetchFirst("SELECT `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` $profile = DBA::fetchFirst("SELECT `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = ? AND `contact`.`self` LIMIT 1", WHERE `user`.`nickname` = ? AND `contact`.`self` LIMIT 1",