X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=plugins%2Farchiveorg%2Farchiveorg.php;fp=plugins%2Farchiveorg%2Farchiveorg.php;h=922b5966fe3340b203b8c98cc6f970555e4b43a5;hb=76fe68d924d424283d0a1784c5f5e7582dda3a00;hp=f26e61292cea3c50e44d32e7f7ff408829d9e881;hpb=0d930454a2892715e691f9c7713e26a3bb4ee96c;p=github%2Fshaarli%2FShaarli.git diff --git a/plugins/archiveorg/archiveorg.php b/plugins/archiveorg/archiveorg.php index f26e6129..922b5966 100644 --- a/plugins/archiveorg/archiveorg.php +++ b/plugins/archiveorg/archiveorg.php @@ -20,10 +20,12 @@ function hook_archiveorg_render_linklist($data) $path = ($data['_BASE_PATH_'] ?? '') . '/' . PluginManager::$PLUGINS_PATH; foreach ($data['links'] as &$value) { - if ($value['private'] && preg_match('/^\?[a-zA-Z0-9-_@]{6}($|&|#)/', $value['real_url'])) { + $isNote = startsWith($value['real_url'], '/shaare/'); + if ($value['private'] && $isNote) { continue; } - $archive = sprintf($archive_html, $value['url'], $path, t('View on archive.org')); + $url = $isNote ? rtrim(index_url($_SERVER), '/') . $value['real_url'] : $value['real_url']; + $archive = sprintf($archive_html, $url, $path, t('View on archive.org')); $value['link_plugin'][] = $archive; }