MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify System class

Browse source 
- Add extension to BaseObject to access App object
This commit is contained in:
Hypolite Petovan 2017-12-17 11:35:06 -05:00
parent 2243a82bb4
commit d328345815
1 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Core/System.php
View file

@ -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);
} }
/** /**