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

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

View file

@ -457,8 +457,8 @@ function dfrn_request_post(App $a)
if ($network == Protocol::DIASPORA) {
$uri = $nickname . '@' . $a->getHostName();
if ($a->getURLPath()) {
$uri .= '/' . $a->getURLPath();
if (DI::baseUrl()->getUrlPath()) {
$uri .= '/' . DI::baseUrl()->getUrlPath();
}
$uri = urlencode($uri);
@ -610,7 +610,7 @@ function dfrn_request_content(App $a)
} elseif (!empty($_GET['address'])) {
$myaddr = $_GET['address'];
} elseif (local_user()) {
if (strlen($a->getURLPath())) {
if (strlen(DI::baseUrl()->getUrlPath())) {
$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
} else {
$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);