X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=testdrive%2Ftestdrive.php;h=1d958ed104ed21bbb1bd349bcec29af7353e6361;hb=101d3603245b17bd2e6d4880e94bb27887257238;hp=9489c838597af260faa7a42a5614a74f461c26de;hpb=e7148d528cacd684fe8e5d0702da241310878bfd;p=friendica-addons.git%2F.git

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 9489c838..1d958ed1 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -7,37 +7,38 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
+use Friendica\Util\Config\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 
 function testdrive_install() {
 
-	Addon::registerHook('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
-	Addon::registerHook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
-	Addon::registerHook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
-	Addon::registerHook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
-	Addon::registerHook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
+	Hook::register('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
+	Hook::register('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
+	Hook::register('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
+	Hook::register('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
+	Hook::register('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
 
 }
 
 
 function testdrive_uninstall() {
 
-	Addon::unregisterHook('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
-	Addon::unregisterHook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
-	Addon::unregisterHook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
-	Addon::unregisterHook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
-	Addon::unregisterHook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
+	Hook::unregister('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
+	Hook::unregister('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
+	Hook::unregister('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
+	Hook::unregister('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
+	Hook::unregister('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
 
 }
 
-function testdrive_load_config(App $a)
+function testdrive_load_config(App $a, ConfigFileLoader $loader)
 {
-	$a->loadConfigFile(__DIR__ . '/config/testdrive.config.php');
+	$a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
 }
 
 function testdrive_globaldir_update($a,&$b) {