bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Move redundant System::baseUrl() to DI::baseUrl() calls

Browse source
This commit is contained in:
Philipp Holzer 2019-12-30 23:00:08 +01:00
commit 3f34229752
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
81 changed files with 418 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Core/System.php
View file

@ -20,17 +20,6 @@ use Friendica\Util\XML;
*/
class System
{
/**
* @brief Retrieves the Friendica instance base URL
*
* @param bool $ssl Whether to append http or https under BaseURL::SSL_POLICY_SELFSIGN
* @return string Friendica server base URL
*/
public static function baseUrl($ssl = false)
{
return DI::baseUrl()->get($ssl);
}
/**
* @brief Removes the baseurl from an url. This avoids some mixed content problems.
*

4
src/Core/Theme.php
View file

@ -125,10 +125,10 @@ class Theme
$exts = ['.png', '.jpg'];
foreach ($exts as $ext) {
if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
return System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext;
return DI::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext;
}
}
return System::baseUrl() . '/images/blank.png';
return DI::baseUrl() . '/images/blank.png';
}
public static function uninstall($theme)

2
src/Core/UserImport.php
View file

@ -123,7 +123,7 @@ class UserImport
}
$oldbaseurl = $account['baseurl'];
$newbaseurl = System::baseUrl();
$newbaseurl = DI::baseUrl();
$oldaddr = str_replace('http://', '@', Strings::normaliseLink($oldbaseurl));
$newaddr = str_replace('http://', '@', Strings::normaliseLink($newbaseurl));

2
src/Core/Worker.php
View file

@ -979,7 +979,7 @@ class Worker
return;
}
$url = System::baseUrl()."/worker";
$url = DI::baseUrl() . '/worker';
Network::fetchUrl($url, false, 1);
}