Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8040 from MrPetovan/bug/notices

Browse source 
Add necessary call to BaseUrl->get() in Module\Objects
This commit is contained in:
Tobias Diekershoff 2019-12-31 19:43:34 +01:00 committed by GitHub
commit d3d63523ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Profile.php
View file

@ -369,7 +369,9 @@ class Profile
if (!$local_user_is_self && $show_connect) {
if (!$visitor_is_authenticated) {
$follow_link = 'dfrn_request/' . $profile['nickname'];
if (!empty($profile['nickname'])) {
$follow_link = 'dfrn_request/' . $profile['nickname'];
}
} elseif ($profile_is_native) {
if ($visitor_is_following) {
$unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url);

2
src/Module/Objects.php
View file

@ -37,7 +37,7 @@ class Objects extends BaseModule
// If no original post could be found, it could possibly be a forum post, there we remove the "origin" field.
// @TODO: Replace with parameter from router
$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
if (!DBA::isResult($item) || !strstr($item['author-link'], DI::baseUrl())) {
if (!DBA::isResult($item) || !strstr($item['author-link'], DI::baseUrl()->get())) {
throw new \Friendica\Network\HTTPException\NotFoundException();
}
}