diff options
author | Andreas Gohr <andi@splitbrain.org> | 2021-11-11 15:42:59 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2021-11-11 15:42:59 +0100 |
commit | 54611a7a6e7af290525dd263f03b7293f20df91a (patch) | |
tree | 0ea64e402f734104bea2866b662a5c4e5a5fbd34 /inc/pageutils.php | |
parent | 01f039b615c23cdd2c8717f50abe78cfb11ab085 (diff) | |
download | dokuwiki-54611a7a6e7af290525dd263f03b7293f20df91a.tar.gz dokuwiki-54611a7a6e7af290525dd263f03b7293f20df91a.zip |
fix fallback implementation for resolve_pageid()
When an empty link was given, the old implementation fell back to $ID,
this was handled incorrectly in the deprecated method.
Diffstat (limited to 'inc/pageutils.php')
-rw-r--r-- | inc/pageutils.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/inc/pageutils.php b/inc/pageutils.php index fe7c50084..04cc796d0 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -550,7 +550,15 @@ function resolve_mediaid($ns,&$media,&$exists,$rev='',$date_at=false){ function resolve_pageid($ns,&$page,&$exists,$rev='',$date_at=false ) { dbg_deprecated(PageResolver::class); - $resolver = new PageResolver("$ns:deprecated"); + + global $ID; + if(getNS($ID) == $ns) { + $context = $ID; // this is usually the case + } else { + $context = "$ns:deprecated"; // only used when a different context namespace was given + } + + $resolver = new PageResolver($context); $page = $resolver->resolveId($page, $rev, $date_at); $exists = page_exists($page, $rev, false, $date_at); } |