| @@ -5,47 +5,24 @@ | ||
| 5 | 5 | use const WPIDE\Constants\DIR; |
| 6 | 6 | |
| 7 | 7 | class AppConfig { |
| 8 | 8 | |
| 9 | - /* @var $config Config */ | |
| 10 | 9 | protected static $config; |
| 11 | 10 | |
| 12 | 11 | public static function load(): Config |
| 13 | 12 | { |
| 14 | - if (empty(self::$config)) { | |
| 15 | - // Only load config after WordPress init | |
| 16 | - if (!did_action('init')) { | |
| 17 | - add_action('init', fn() => self::$config = new Config(require DIR.'_configuration.php')); | |
| 18 | - // Return empty config temporarily | |
| 19 | - self::$config = new Config([]); | |
| 20 | - } else { | |
| 21 | - self::$config = new Config(require DIR.'_configuration.php'); | |
| 22 | - } | |
| 13 | + if(!empty(self::$config )) { | |
| 14 | + return self::$config; | |
| 23 | 15 | } |
| 24 | - return self::$config; | |
| 25 | - } | |
| 26 | 16 | |
| 27 | - public static function get($key = null, $default = null) | |
| 28 | - { | |
| 29 | - return self::load()->get($key, $default); | |
| 30 | - } | |
| 17 | + self::$config = new Config(require DIR.'_configuration.php'); | |
| 31 | 18 | |
| 32 | - public static function update($key , $value) | |
| 33 | - { | |
| 34 | - return self::load()->update($key, $value); | |
| 19 | + return self::$config; | |
| 35 | 20 | } |
| 36 | 21 | |
| 37 | - public static function delete($key) | |
| 22 | + public static function get($key, $default = null) | |
| 38 | 23 | { |
| 39 | - self::load()->delete($key); | |
| 40 | - } | |
| 24 | + self::load(); | |
| 41 | 25 | |
| 42 | - public static function getField($key) | |
| 43 | - { | |
| 44 | - return self::load()->getField($key); | |
| 26 | + return self::$config->get($key, $default); | |
| 45 | 27 | } |
| 46 | - | |
| 47 | - public static function fieldExists($key): bool | |
| 48 | - { | |
| 49 | - return self::load()->fieldExists($key); | |
| 50 | - } | |
| 51 | -} | |
| 28 | +} | |