q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't cascade blogDirs setting into individual blog dir items

Browse source
This commit is contained in:
Uriel 2007-06-13 11:58:22 +02:00
parent 5a6eef9ee8
commit 3704245426
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bin/controller.rc
View file

@ -80,7 +80,7 @@ fn genbody {
if not if ( test -f $body.html ) if not if ( test -f $body.html )
cat $body.html | /bin/sed '0,/<body>/d; /<\/body>/,$d' cat $body.html | /bin/sed '0,/<body>/d; /<\/body>/,$d'
if not if (~ $body *.html && test -f $body ) if not if (~ $body *.html && test -f $body )
sed '0,/<body>/d;/<\/body>/,$d' < $body cat $body | /bin/sed -i '0,/<body[^>]*>/d;/<\/body>/,$d'
if not if ( ~ $body */[bB]log/index */[bB]log//index && ~ $#blogDirs 0 ) if not if ( ~ $body */[bB]log/index */[bB]log//index && ~ $#blogDirs 0 )
blogDirs = `{basename -d $body} blogDirs = `{basename -d $body}
if not if(~ $body */index && ~ $#blogDirs 0) { if not if(~ $body */index && ~ $#blogDirs 0) {
@ -119,6 +119,7 @@ if (! ~ $args '') {
fpath=$sitedir fpath=$sitedir
for ( i in '' $args ) { for ( i in '' $args ) {
fpath = $fpath/$i fpath = $fpath/$i
blogDirs = () # We don't want blog settings to cascade into posts
if ( test -f $fpath/_config ) if ( test -f $fpath/_config )
. $fpath/_config . $fpath/_config
} }