Merge commit 'a7a6d7ad2cba7831544b160d9038cde2773dff4e'

[shellwiki] / handlers / 90_brackets.sh

diff --git a/handlers/90_brackets.sh b/handlers/90_brackets.sh
index f509294c69f470217dc7adc32a8d6844bc7da45e..1f11cf4448697124a7b4fdfe08a2f64cc42aecae 100755 (executable)
--- a/handlers/90_brackets.sh
+++ b/handlers/90_brackets.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-# spacial case for bracket pages that are not handled otherwise
+# special case for odd pages that are not handled otherwise
+# usually those pages look like handlers (i.e. containing brackets)
+# but are not
 # attachment and edit (and really all) handlers should take precedence
 
 case "${PATH_INFO}" in
-  */\[*\]/*)
+  */\[view\])
+    # explicit view handler for linking
+    REDIRECT "${_BASE}${PATH_INFO%\[view\]}"
+    ;;
+  */)
     if [ ! "$(mdfile "${PATH_INFO}")" ]; then
       theme_error 404
     elif ! acl_read "${PATH_INFO}"; then
@@ -14,6 +20,11 @@ case "${PATH_INFO}" in
     fi
     return 0
     ;;
+  *)
+    if [ -d "$_DATA/pages${PATH_INFO}/" -o -d "$_EXEC/pages${PATH_INFO}/" ]; then
+      REDIRECT "${_BASE}${PATH_INFO}/"
+    fi
+    ;;
 esac
 
 return 1