PluginManager no longer uses singleton pattern

[github/shaarli/Shaarli.git] / plugins / wallabag / wallabag.php

diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php
index 4726d9369fab4ef8dd9ef0bada8e323a626d3aac..ec09c8a14d03dc89e2865efb794756d5ee199102 100644 (file)
--- a/plugins/wallabag/wallabag.php
+++ b/plugins/wallabag/wallabag.php
@@ -6,24 +6,22 @@
 
 require_once 'WallabagInstance.php';
 
-$conf = ConfigManager::getInstance();
 $wallabagUrl = $conf->get('plugins.WALLABAG_URL');
 if (empty($wallabagUrl)) {
     $GLOBALS['plugin_errors'][] = 'Wallabag plugin error: '.
-        'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '.
-        'in "plugins/wallabag/config.php" or in your Shaarli config.php file.';
+        'Please define the "WALLABAG_URL" setting in the plugin administration page.';
 }
 
 /**
  * Add wallabag icon to link_plugin when rendering linklist.
  *
- * @param mixed $data - linklist data.
+ * @param mixed         $data Linklist data.
+ * @param ConfigManager $conf Configuration Manager instance.
  *
  * @return mixed - linklist data with wallabag plugin.
  */
-function hook_wallabag_render_linklist($data)
+function hook_wallabag_render_linklist($data, $conf)
 {
-    $conf = ConfigManager::getInstance();
     $wallabagUrl = $conf->get('plugins.WALLABAG_URL');
     if (empty($wallabagUrl)) {
         return $data;