Merge pull request #841 from annando/no-queue

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

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index fea062705072adb19b84a162fcc39c3ce6c8b7b4..22d6875a340d23c5f5527cdeb5af926fbdf2930c 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,21 +8,21 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Util\Security;
+use Friendica\Util\Config\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
  */
 function gravatar_install() {
-       Addon::registerHook('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
-       Addon::registerHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
+       Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
+       Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
        Logger::log("registered gravatar in avatar_lookup hook");
 }
@@ -31,15 +31,15 @@ function gravatar_install() {
  * Removes the addon hook
  */
 function gravatar_uninstall() {
-       Addon::unregisterHook('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
-       Addon::unregisterHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
+       Hook::unregister('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
+       Hook::unregister('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
        Logger::log("unregistered gravatar in avatar_lookup hook");
 }
 
-function gravatar_load_config(App $a)
+function gravatar_load_config(App $a, ConfigFileLoader $loader)
 {
-       $a->loadConfigFile(__DIR__ . '/config/gravatar.config.php');
+       $a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
 }
 
 /**