Merge commit 'f5a7a98f217d9a047cba2c9c92c21baa46d9e0db'

[shellwiki] / macros / revisions

diff --git a/macros/revisions b/macros/revisions
index 2bd83f5ae487d2f4f38b17a2e7401f9cda2e61da..4271149cffbd8074d89f16d88418b26f5f842441 100755 (executable)
--- a/macros/revisions
+++ b/macros/revisions
@@ -9,7 +9,7 @@ page_abs="$(page_abs "$page")"
 
 if ! acl_read "$page_abs"; then
   return 0
-elif [ ! "$(which git)" ]; then
+elif [ "$REV_PAGES" != true ]; then
   printf '<div class="macro revisions error">GIT is not available to handle revisioning.</div>'
 fi
 
@@ -22,6 +22,6 @@ printf '<ul class="macro revisions">\n'
   } | while read -r hash date message; do
     user="${message% @*}"; user="${user##*@ }"
     printf '<li><span class="hash"><a href="%s">%s</a></span><span class="date">%s</span><span class="user">%s</span></li>\n' \
-      "$(HTML "${page%/}/[revisions]/$hash")" "$(HTML "$hash")" "$(HTML "$date")" "$(HTML "$user")"
+      "$(HTML "${page%/}/[revision]/$hash")" "$(HTML "$hash")" "$(HTML "$date")" "$(HTML "$user")"
   done
 printf '</ul>\n'