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

Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()

Browse source
This commit is contained in:
nupplaPhil 2019-12-16 01:05:15 +01:00
parent e57a87f224
commit e944d7bed6
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
43 changed files with 76 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Item.php
View file

@ -2511,7 +2511,7 @@ class Item
$guid = System::createUUID();
}
return DI::app()->getBaseURL() . '/objects/' . $guid;
return DI::baseUrl()->get() . '/objects/' . $guid;
}
/**

6
src/Model/Photo.php
View file

@ -679,8 +679,7 @@ class Photo
*/
public static function getGUID($name)
{
$a = \get_app();
$base = $a->getBaseURL();
$base = DI::baseUrl()->get();
$guid = str_replace([Strings::normaliseLink($base), '/photo/'], '', Strings::normaliseLink($name));
@ -725,8 +724,7 @@ class Photo
*/
public static function isLocalPage($name)
{
$a = \get_app();
$base = $a->getBaseURL();
$base = DI::baseUrl()->get();
$guid = str_replace(Strings::normaliseLink($base), '', Strings::normaliseLink($name));
$guid = preg_replace("=/photos/.*/image/(.*)=ism", '$1', $guid);

6
src/Model/Profile.php
View file

@ -337,7 +337,7 @@ class Profile
if (isset($profile['url'])) {
$profile_url = $profile['url'];
} else {
$profile_url = $a->getBaseURL() . '/profile/' . $profile['nickname'];
$profile_url = DI::baseUrl()->get() . '/profile/' . $profile['nickname'];
}
$follow_link = null;
@ -1080,13 +1080,13 @@ class Profile
$query = rtrim(str_replace($addr_request, '', $a->query_string), '?&');
// The other instance needs to know where to redirect.
$dest = urlencode($a->getBaseURL() . '/' . $query);
$dest = urlencode(DI::baseUrl()->get() . '/' . $query);
// We need to extract the basebath from the profile url
// to redirect the visitors '/magic' module.
$basepath = Contact::getBasepath($contact['url']);
if ($basepath != $a->getBaseURL() && !strstr($dest, '/magic')) {
if ($basepath != DI::baseUrl()->get() && !strstr($dest, '/magic')) {
$magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
// We have to check if the remote server does understand /magic without invoking something