Merge pull request #823 from tobiasd/20190312-blackout

[friendica-addons.git] / public_server / public_server.php

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 52d9c6e0f5b3e85662167f4931f8749bccc5790c..639b8fcef21a6a25306237803a3bf87ab991e6ed 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -8,7 +8,6 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -36,9 +35,9 @@ function public_server_uninstall()
        Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
-function public_server_load_config(App $a)
+function public_server_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
 {
-       $a->loadConfigFile(__DIR__ . '/config/public_server.config.php');
+       $a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
 }
 
 function public_server_register_account($a, $b)
@@ -59,7 +58,6 @@ function public_server_cron($a, $b)
 {
        Logger::log("public_server: cron start");
 
-       require_once('include/enotify.php');
        $r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
                `account_expires_on` > '%s' AND
                `expire_notification_sent` <= '%s'",