Merge commit 'bfe458e83c0157879767976ba97bf95d1e27918c'

[shellwiki] / macros / pagelist

diff --git a/macros/pagelist b/macros/pagelist
index 7c800418c41c02a259caab7bc7eeb79c14963e42..54d4a693f2f0d8d2d0fc76bb40b3bbe3b50d6077 100755 (executable)
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 . "$_EXEC/cgilite/cgilite.sh"
-. "$_EXEC/cgilite/users.sh"
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
@@ -15,10 +14,7 @@ printf '<ul class="pagelist">\n'
     page_children "$glob" "$((depth - 1))"
   done \
   | while read -r page; do
-    case $page in
-      /*) pagedir="$(PATH "$page")";;
-      *)  pagedir="$(PATH "$PATH_INFO/$page")";;
-    esac
+    pagedir="$(page_abs "$page")"
     [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
       -f "$_EXEC/pages/${pagedir}/#page.md" ] \
     && acl_read "$pagedir" \