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

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

Browse source
This commit is contained in:
nupplaPhil 2019-12-16 00:39:54 +01:00
parent e93fba5136
commit 2900389696
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
9 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Admin/Site.php
View file

@ -242,7 +242,7 @@ class Site extends BaseAdminModule
Worker::add(PRIORITY_LOW, 'Directory');
}
if ($a->getURLPath() != "") {
if (DI::baseUrl()->getUrlPath() != "") {
$diaspora_enabled = false;
}
if ($ssl_policy != intval(Config::get('system', 'ssl_policy'))) {
@ -523,7 +523,7 @@ class Site extends BaseAdminModule
'develop' => L10n::t('check the development version')
];
$diaspora_able = ($a->getURLPath() == '');
$diaspora_able = (DI::baseUrl()->getUrlPath() == '');
$optimize_max_tablesize = Config::get('system', 'optimize_max_tablesize', -1);

2
src/Module/Magic.php
View file

@ -80,7 +80,7 @@ class Magic extends BaseModule
$headers = HTTPSignature::createSig(
$headers,
$user['prvkey'],
'acct:' . $user['nickname'] . '@' . $a->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : '')
'acct:' . $user['nickname'] . '@' . $a->getHostName() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')
);
// Try to get an authentication token from the other instance.

2
src/Module/Profile.php
View file

@ -120,7 +120,7 @@ class Profile extends BaseModule
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\n";
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\n";
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . self::$which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\n";
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''));
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : ''));
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\n";
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);