mirror of
https://github.com/friendica/friendica
synced 2025-04-23 12:30:10 +00:00
Replace static calls of DI::app() with DI::apphelper()
This commit is contained in:
parent
4f16bbe5f5
commit
9074258b78
5 changed files with 8 additions and 12 deletions
|
@ -59,11 +59,11 @@ class Create extends BaseApi
|
|||
$finish = DBA::NULL_DATETIME;
|
||||
$nofinish = true;
|
||||
} else {
|
||||
$finish = DateTimeFormat::convert($request['end_time'], 'UTC', DI::app()->getTimeZone());
|
||||
$finish = DateTimeFormat::convert($request['end_time'], 'UTC', DI::apphelper()->getTimeZone());
|
||||
$nofinish = false;
|
||||
}
|
||||
|
||||
$start = DateTimeFormat::convert($request['start_time'], 'UTC', DI::app()->getTimeZone());
|
||||
$start = DateTimeFormat::convert($request['start_time'], 'UTC', DI::apphelper()->getTimeZone());
|
||||
|
||||
// create event
|
||||
$event = [];
|
||||
|
|
|
@ -40,8 +40,6 @@ class Account extends BaseSettings
|
|||
|
||||
self::checkFormSecurityTokenRedirectOnError($redirectUrl, 'settings');
|
||||
|
||||
$a = DI::app();
|
||||
|
||||
$user = User::getById($this->session->getLocalUserId());
|
||||
|
||||
if (!empty($request['password-submit'])) {
|
||||
|
@ -111,7 +109,7 @@ class Account extends BaseSettings
|
|||
}
|
||||
|
||||
if (strlen($timezone) && $timezone != $user['timezone']) {
|
||||
$a->setTimeZone($timezone);
|
||||
DI::apphelper()->setTimeZone($timezone);
|
||||
}
|
||||
|
||||
$fields = [
|
||||
|
@ -383,8 +381,6 @@ class Account extends BaseSettings
|
|||
return '';
|
||||
}
|
||||
|
||||
$a = DI::app();
|
||||
|
||||
$user = User::getById($this->session->getLocalUserId());
|
||||
|
||||
$username = $user['username'];
|
||||
|
@ -404,7 +400,7 @@ class Account extends BaseSettings
|
|||
$expire_network_only = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'expire', 'network_only', false);
|
||||
|
||||
if (!strlen($user['timezone'])) {
|
||||
$timezone = $a->getTimeZone();
|
||||
$timezone = DI::apphelper()->getTimeZone();
|
||||
}
|
||||
|
||||
// Set the account type to "Community" when the page is a community page but the account type doesn't fit
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue