X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fwallabag%2Fwallabag.php;h=641e4cc237ed4f20a44fafda7eae1b871bf2e118;hb=06eec9bf764662cd328627247a1f43e4abd3c5ad;hp=4726d9369fab4ef8dd9ef0bada8e323a626d3aac;hpb=eeea1c3daa87f133c57c96fa17ed26b02c392636;p=github%2Fshaarli%2FShaarli.git

diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php
index 4726d936..641e4cc2 100644
--- a/plugins/wallabag/wallabag.php
+++ b/plugins/wallabag/wallabag.php
@@ -6,24 +6,33 @@
 
 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.';
+/**
+ * Init function, return an error if the server is not set.
+ *
+ * @param $conf ConfigManager instance.
+ *
+ * @return array Eventual error.
+ */
+function wallabag_init($conf)
+{
+    $wallabagUrl = $conf->get('plugins.WALLABAG_URL');
+    if (empty($wallabagUrl)) {
+        $error = 'Wallabag plugin error: '.
+            'Please define the "WALLABAG_URL" setting in the plugin administration page.';
+        return array($error);
+    }
 }
 
 /**
  * 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;