Merge pull request #8053 from nupplaphil/task/remove_get_app
Remove get_app() in favor of DI::app()
This commit is contained in:
commit
c8a322baf0
28 changed files with 113 additions and 110 deletions
29
boot.php
29
boot.php
|
@ -234,29 +234,6 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
|
|||
define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Retrieve the App structure
|
||||
*
|
||||
* Useful in functions which require it but don't get it passed to them
|
||||
*
|
||||
* @deprecated since version 2018.09
|
||||
* @see DI::app()
|
||||
* @return App
|
||||
*/
|
||||
function get_app()
|
||||
{
|
||||
return DI::app();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Used to end the current process, after saving session state.
|
||||
* @deprecated
|
||||
*/
|
||||
function killme()
|
||||
{
|
||||
exit();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Returns the user id of locally logged in user or false.
|
||||
*
|
||||
|
@ -325,7 +302,7 @@ function notice($s)
|
|||
return;
|
||||
}
|
||||
|
||||
$a = \get_app();
|
||||
$a = DI::app();
|
||||
if (empty($_SESSION['sysmsg'])) {
|
||||
$_SESSION['sysmsg'] = [];
|
||||
}
|
||||
|
@ -343,7 +320,7 @@ function notice($s)
|
|||
*/
|
||||
function info($s)
|
||||
{
|
||||
$a = \get_app();
|
||||
$a = DI::app();
|
||||
|
||||
if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
|
||||
return;
|
||||
|
@ -406,7 +383,7 @@ function feed_birthday($uid, $tz)
|
|||
*/
|
||||
function is_site_admin()
|
||||
{
|
||||
$a = \get_app();
|
||||
$a = DI::app();
|
||||
|
||||
$admin_email = Config::get('config', 'admin_email');
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue