Don't execute perm_redirects directly from conf_perm_redirect to avoid tripping over sitemaps and other code that sources config files but doesn't want to actually *do* anything. Also hide paths with simple or pattern redirects from sitemaps.
This commit is contained in:
parent
798ea3b262
commit
e0f4f8b5f3
@ -81,6 +81,8 @@ fn werc_exec_request {
|
||||
}
|
||||
cd $werc_root
|
||||
|
||||
if(~ $#perm_redir_to 1)
|
||||
perm_redirect $perm_redir_to
|
||||
f=();t=()
|
||||
for(i in $perm_redir_patterns) {
|
||||
if(~ $#f 0)
|
||||
|
@ -1,9 +1,11 @@
|
||||
# To be used from config files
|
||||
fn conf_perm_redirect {
|
||||
if(~ $#* 1)
|
||||
perm_redirect $1
|
||||
if not
|
||||
perm_redir_to=$1
|
||||
if not {
|
||||
perm_redir_patterns=($perm_redir_patterns $1 $2)
|
||||
conf_hide_paths $1 # XXX Will hide paths even if replacement string is the same as matched sctring.
|
||||
}
|
||||
}
|
||||
|
||||
fn conf_hide_paths {
|
||||
|
@ -39,6 +39,7 @@ fn listDir {
|
||||
if(test -f $d/_werc/config)
|
||||
. ./$d/_werc/config
|
||||
|
||||
if(~ $#perm_redir_to 0) {
|
||||
echo '<ul class="sitemap-list">'
|
||||
|
||||
for(i in `{ls -dF $d^*/ $d^*.md $d^*.html $d^*.txt >[2]/dev/null | sed $dirfilter}) {
|
||||
@ -54,6 +55,7 @@ fn listDir {
|
||||
}
|
||||
echo '</ul>'
|
||||
}
|
||||
}
|
||||
|
||||
fltr_cache listDir $sitedir/
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user