Fix depreciation warnings on DokuWiki

lpaulsen93 · Jan 30, 2024 · 2cdbcff · 2cdbcff
1 parent 5ddb29e
commit 2cdbcff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/renderer/book.php b/renderer/book.php
@@ -123,7 +123,8 @@ function internallink($id, $name = NULL, $returnonly = false) {
         // default name is based on $id as given
         $default = $this->_simpleTitle($id);
         // now first resolve and clean up the $id
-        resolve_pageid(getNS($ID),$id,$exists);
+        $resolver = new \dokuwiki\File\PageResolver($ID);
+        $id = $resolver->resolveId($id);
         $name = $this->_getLinkTitle($name, $default, $isImage, $id);
 
         // build the absolute URL (keeping a hash if any)

diff --git a/renderer/page.php b/renderer/page.php
@@ -1174,7 +1174,8 @@ function _highlight($type, $text, $language=null, $options = null) {
     function internalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
                             $height=NULL, $cache=NULL, $linking=NULL, $returnonly = false) {
         global $ID;
-        resolve_mediaid(getNS($ID),$src, $exists);
+        $resolver = new \dokuwiki\File\MediaResolver($ID);
+        $src = $resolver->resolveId($src);
         list(/* $ext */,$mime) = mimetype($src);
 
         if ($linking == 'linkonly') {
@@ -1324,7 +1325,8 @@ function internallink($id, $name = NULL, $returnonly = false) {
         // default name is based on $id as given
         $default = $this->_simpleTitle($id);
         // now first resolve and clean up the $id
-        resolve_pageid(getNS($ID),$id,$exists);
+        $resolver = new \dokuwiki\File\PageResolver($ID);
+        $id = $resolver->resolveId($id);
         $name = $this->_getLinkTitle($name, $default, $isImage, $id);
 
         // build the absolute URL (keeping a hash if any)