Skip to content

Strip parameter and fix relative link. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Strip parameter and fix relative link. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7078fef
Update renderer.php
alexdraconian Mar 1, 2021
bf664e9
Update renderer.php
alexdraconian Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ function actionrenderer(Doku_Event $event, $param) {
$returnonly = $args[3] ?: false;
$linktype = $args[4] ?: 'content';

resolve_pageid(getNS($ID), $id, $exists);

global $ID;
if (!$this->m_helper->isExcluded($ID) && page_exists($id) && $id != $ID) {
if (!$this->m_helper->isExcluded($ID) && $exists && $id != $ID) {
Comment on lines +51 to +54
Copy link
Owner

@zioth zioth Mar 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this change accomplish?

Copy link
Author

@alexdraconian alexdraconian Mar 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there're relative links, autotooltip did not recognize them as relative link, but absolute link.

Example:
In "namespace:some_page", there're link like "[[other_page]]".
Since this is relative link, this link should be resolved as ":namespace:other_page".
However autotooltip resolved as ":other_page" and consider linked page does not exist.

So I re-positioned link resolve logic to early stage.

$event->preventDefault();

// If we call $renderer->internallink directly here, it will cause infinite recursion,
Expand Down
1 change: 0 additions & 1 deletion helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ public function stripNativeTooltip($link) {
*/
static function read_meta_fast($id) {
global $ID;
$id = resolve_id(getNS($ID), preg_replace('/\#.*$/', '', $id), true);

if (isset(self::$metaCache[$id])) {
return self::$metaCache[$id];
Expand Down
5 changes: 3 additions & 2 deletions renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ function canRender($format) {
function internallink($id, $name = null, $search = null, $returnonly = false, $linktype = 'content') {
global $ID;
$fullId = $id;
$id = preg_replace('/\#.*$/', '', $id);
$id = preg_replace('/(\#|\?).*$/', '', $id);
resolve_pageid(getNS($ID), $id, $exists, $this->date_at, true);

if (!$this->m_exclude && page_exists($id) && $id != $ID) {
if (!$this->m_exclude && $exists && $id != $ID) {
$link = parent::internallink($fullId, $name, $search, true, $linktype);

$meta = $this->m_helper->read_meta_fast($id);
Expand Down