diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-24 16:25:06 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-27 21:03:29 +0100 |
commit | 358cb20bcba3cb7b0ce2a3000fb7026465a10386 (patch) | |
tree | 2e99206786b5ef423aff418947b53a577460246a /plugins/wallabag | |
parent | 820cae27cfcc94af552818f3f1e5342e00478f6c (diff) | |
download | Shaarli-358cb20bcba3cb7b0ce2a3000fb7026465a10386.tar.gz Shaarli-358cb20bcba3cb7b0ce2a3000fb7026465a10386.tar.zst Shaarli-358cb20bcba3cb7b0ce2a3000fb7026465a10386.zip |
Plugin wallabag: minor improvements
- hide the wallabag icon for logged out users
- set API V2 as default parameter
- fix URL encoding issue with special chars
Fixes #1147
Diffstat (limited to 'plugins/wallabag')
-rw-r--r-- | plugins/wallabag/wallabag.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php index d0df3501..8cd3f4ad 100644 --- a/plugins/wallabag/wallabag.php +++ b/plugins/wallabag/wallabag.php | |||
@@ -22,6 +22,7 @@ function wallabag_init($conf) | |||
22 | 'Please define the "WALLABAG_URL" setting in the plugin administration page.'); | 22 | 'Please define the "WALLABAG_URL" setting in the plugin administration page.'); |
23 | return array($error); | 23 | return array($error); |
24 | } | 24 | } |
25 | $conf->setEmpty('plugins.WALLABAG_URL', '2'); | ||
25 | } | 26 | } |
26 | 27 | ||
27 | /** | 28 | /** |
@@ -35,7 +36,7 @@ function wallabag_init($conf) | |||
35 | function hook_wallabag_render_linklist($data, $conf) | 36 | function hook_wallabag_render_linklist($data, $conf) |
36 | { | 37 | { |
37 | $wallabagUrl = $conf->get('plugins.WALLABAG_URL'); | 38 | $wallabagUrl = $conf->get('plugins.WALLABAG_URL'); |
38 | if (empty($wallabagUrl)) { | 39 | if (empty($wallabagUrl) || !$data['_LOGGEDIN_']) { |
39 | return $data; | 40 | return $data; |
40 | } | 41 | } |
41 | 42 | ||
@@ -51,7 +52,7 @@ function hook_wallabag_render_linklist($data, $conf) | |||
51 | $wallabag = sprintf( | 52 | $wallabag = sprintf( |
52 | $wallabagHtml, | 53 | $wallabagHtml, |
53 | $wallabagInstance->getWallabagUrl(), | 54 | $wallabagInstance->getWallabagUrl(), |
54 | urlencode($value['url']), | 55 | urlencode(unescape($value['url'])), |
55 | $path, | 56 | $path, |
56 | $linkTitle | 57 | $linkTitle |
57 | ); | 58 | ); |