Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 04:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
nupplaPhil 2019-12-16 00:48:20 +01:00
parent 50be94aa5e
commit e57a87f224
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/worker.php
View file

@ -46,7 +46,7 @@ if (!DI::mode()->has(App\Mode::MAINTENANCEDISABLED)) {
return; return;
} }
$a->setBaseURL(Config::get('system', 'url')); DI::baseUrl()->saveByURL(Config::get('system', 'url'));
$spawn = array_key_exists('s', $options) || array_key_exists('spawn', $options); $spawn = array_key_exists('s', $options) || array_key_exists('spawn', $options);

14
src/App.php
View file

@ -285,20 +285,6 @@ class App
return $this->baseURL->get($ssl); return $this->baseURL->get($ssl);
} }
/**
* @brief Initializes the baseurl components
*
* Clears the baseurl cache to prevent inconsistencies
*
* @param string $url
*
* @deprecated 2019.06 - use BaseURL->saveByURL($url) instead
*/
public function setBaseURL($url)
{
$this->baseURL->saveByURL($url);
}
/** /**
* Returns the current UserAgent as a String * Returns the current UserAgent as a String
* *

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

@ -95,7 +95,7 @@ class Site extends BaseAdminModule
// update config // update config
Config::set('system', 'url', $new_url); Config::set('system', 'url', $new_url);
$a->setBaseURL($new_url); DI::baseUrl()->saveByURL($new_url);
// send relocate // send relocate
$usersStmt = DBA::select('user', ['uid'], ['account_removed' => false, 'account_expired' => false]); $usersStmt = DBA::select('user', ['uid'], ['account_removed' => false, 'account_expired' => false]);