Merge pull request #275 from nerun/deprecation

Fix deprecations: html_li_index and PageResolver
samuelet · Dec 14, 2023 · e794ca0 · e794ca0
2 parents ccec376 + 73ed217
commit e794ca0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/action.php b/action.php
@@ -352,7 +352,7 @@ function print_index($ns) {
         $out = '';
         if($_REQUEST['nojs']) {
             require_once(DOKU_INC.'inc/html.php');
-            $out_tmp = html_buildlist($data, 'idx', array($idxm, "_html_list_index"), "html_li_index");
+            $out_tmp = html_buildlist($data, 'idx', array($idxm, "_html_list_index"), "tagListItem");
             $out .= preg_replace('/<ul class="idx">(.*)<\/ul>/s', "$1", $out_tmp);
         } else {
             $nodes = $idxm->_jsnodes($data, '', 0);

diff --git a/ajax.php b/ajax.php
@@ -189,7 +189,7 @@ function print_index($ns) {
         }
         if($_REQUEST['nojs']) {
             require_once(DOKU_INC.'inc/html.php');
-            $out_tmp = html_buildlist($data, 'idx', array($idxm, "_html_list_index"), "html_li_index");
+            $out_tmp = html_buildlist($data, 'idx', array($idxm, "_html_list_index"), "tagListItem");
             $out .= preg_replace('/<ul class="idx">(.*)<\/ul>/s', "$1", $out_tmp);
         } else {
             $nodes = $idxm->_jsnodes($data, '', 0);

diff --git a/syntax/indexmenu.php b/syntax/indexmenu.php
@@ -6,7 +6,7 @@
  * @author      Samuele Tognini <[email protected]>
  *
  */
-
+use dokuwiki\File\PageResolver;
 if(!defined('DOKU_INC')) die();
 if(!defined('INDEXMENU_IMG_ABSDIR')) define('INDEXMENU_IMG_ABSDIR', DOKU_PLUGIN."indexmenu/images");
 
@@ -428,7 +428,7 @@ private function _indexmenu($myns) {
         //    the toggle interacts with hide needed for js option.
         $output = "\n";
         $output .= '<div><div id="nojs_'.$js_name.'" data-jsajax="'.utf8_encodeFN($js_opts['jsajax']).'" class="indexmenu_nojs">'."\n";
-        $output .= html_buildlist($data, 'idx', array($this, "_html_list_index"), "html_li_index");
+        $output .= html_buildlist($data, 'idx', array($this, "_html_list_index"), "tagListItem");
         $output .= "</div></div>\n";
         $output .= $output_tmp;
         return $output;
@@ -617,13 +617,18 @@ private function _getTitle($ns, $headpage, &$hns) {
      * @return string id of namespace
      */
     public function _parse_ns($ns, $id = FALSE) {
-        if(!$id) {
+        if(!$id === false) {
             global $ID;
             $id = $ID;
         }
-        //Just for old reelases compatibility
-        if(empty($ns) || $ns == '..') $ns = ":..";
-        return resolve_id(getNS($id), $ns);
+        //Just for old reelases compatibility, .. was an old version for : in the docs of indexmenu
+        if ($ns == '..') {
+            $ns = ":";
+        }
+        $ns = "$ns:arandompagehere";
+        $resolver = new PageResolver($id);
+        $ns = getNs($resolver->resolveId($ns));
+        return $ns === false ? '' : $ns;
     }
 
     /**