Merge commit 'c1c97928352f0ac36034432f5bbba708c4146ff0'

[serve0] / list.sh

diff --git a/list.sh b/list.sh
index ccb91393dec2821f375cf797f485b86a772dafa0..dd5c83d4a44989e69e23ee17e57c524adb9c2c03 100755 (executable)
--- a/list.sh
+++ b/list.sh
@@ -6,7 +6,6 @@
 
 list_item() {
   local meta file link name
-  eval "$LOCAL_META"
 
   if [ "${META_NAME%/}" != "${META_NAME}" ]; then
     printf '[a .list .dir href="%s?%s" . %s]' \
@@ -56,7 +55,7 @@ list_item() {
 )"
 
 list_fullname(){
-  local short="$(UNSTRING "${1%${CR}}")" file
+  local short="$1" file
   file="$(printf %s\\n "$_DATA/$ITEM/$short".*)"
   file="${file%%${BR}*}"
   [ -e "$file" ] && printf %s\\n "${file#${_DATA}/${ITEM}/}"
@@ -157,6 +156,7 @@ list_paginate() {
   local page i c n end qry
   page="$(GET p |grep -axE '[0-9]+' || printf 1)"; c=1
   end=$((page + LISTSIZE))
+  eval "$LOCAL_META"  # localize vars from db_meta
 
   printf '[div .itemlist '
   while :; do