mirror of
https://github.com/friendica/friendica
synced 2024-11-10 10:22:53 +00:00
Simplify System class
- Add extension to BaseObject to access App object
This commit is contained in:
parent
2243a82bb4
commit
d328345815
1 changed files with 4 additions and 21 deletions
|
@ -4,7 +4,7 @@
|
||||||
*/
|
*/
|
||||||
namespace Friendica\Core;
|
namespace Friendica\Core;
|
||||||
|
|
||||||
use Friendica\App;
|
use Friendica\BaseObject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file include/Core/System.php
|
* @file include/Core/System.php
|
||||||
|
@ -16,23 +16,8 @@ use Friendica\App;
|
||||||
/**
|
/**
|
||||||
* @brief System methods
|
* @brief System methods
|
||||||
*/
|
*/
|
||||||
class System
|
class System extends BaseObject
|
||||||
{
|
{
|
||||||
private static $a;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Initializes the static class variable
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
private static function init()
|
|
||||||
{
|
|
||||||
global $a;
|
|
||||||
|
|
||||||
if (!is_object(self::$a)) {
|
|
||||||
self::$a = $a;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Retrieves the Friendica instance base URL
|
* @brief Retrieves the Friendica instance base URL
|
||||||
*
|
*
|
||||||
|
@ -41,8 +26,7 @@ class System
|
||||||
*/
|
*/
|
||||||
public static function baseUrl($ssl = false)
|
public static function baseUrl($ssl = false)
|
||||||
{
|
{
|
||||||
self::init();
|
return self::getApp()->get_baseurl($ssl);
|
||||||
return self::$a->get_baseurl($ssl);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -54,8 +38,7 @@ class System
|
||||||
*/
|
*/
|
||||||
public static function removedBaseUrl($orig_url)
|
public static function removedBaseUrl($orig_url)
|
||||||
{
|
{
|
||||||
self::init();
|
return self::getApp()->remove_baseurl($orig_url);
|
||||||
return self::$a->remove_baseurl($orig_url);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue