Enable search for lib files in deprecated paths only if disableDeprecated is not true.
This commit is contained in:
parent
83a10c526a
commit
431b8c7eae
2 changed files with 8 additions and 5 deletions
|
|
@ -25,16 +25,16 @@ fn get_lib_file {
|
||||||
echo -n lib/$wantedfile
|
echo -n lib/$wantedfile
|
||||||
|
|
||||||
# DEPRECATED
|
# DEPRECATED
|
||||||
if (test -f $sitedir/_inc/$wantedfile) {
|
if not if (~ $#disableDeprecated 0 && test -f $sitedir/_inc/$wantedfile) {
|
||||||
echo -n $sitedir/_inc/$wantedfile
|
echo -n $sitedir/_inc/$wantedfile
|
||||||
dprint DEPRECATION WARNING: Using file in depracted path: $sitedir/_inc/$wantedfile XXX
|
dprint DEPRECATION WARNING: Using file in depracted path: $sitedir/_inc/$wantedfile XXX
|
||||||
}
|
}
|
||||||
if not if(! ~ $masterSite 0 && test -f sites/$masterSite/_inc/$wantedfile) {
|
if not if(~ $#disableDeprecated 0 && ! ~ $masterSite 0 && test -f sites/$masterSite/_inc/$wantedfile) {
|
||||||
echo -n sites/$masterSite/_inc/$wantedfile
|
echo -n sites/$masterSite/_inc/$wantedfile
|
||||||
dprint DEPRECATION WARNING: Using file in depracted path: sites/$masterSite/_inc/$wantedfile XXX
|
dprint DEPRECATION WARNING: Using file in depracted path: sites/$masterSite/_inc/$wantedfile XXX
|
||||||
}
|
}
|
||||||
if not if (test -f inc/$wantedfile) {
|
if not if (~ $#disableDeprecated 0 && test -f inc/$wantedfile) {
|
||||||
echo -n inc/$wantedfile
|
echo -n inc/$wantedfile
|
||||||
dprint DEPRECATION WARNING: Using file in depracted path: inc/$wantedfile XXX
|
dprint DEPRECATION WARNING: Using file in depracted path: inc/$wantedfile XXX
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,9 @@ formatter=md_cache
|
||||||
# Enable debugging, to disable set to ()
|
# Enable debugging, to disable set to ()
|
||||||
debug=true
|
debug=true
|
||||||
|
|
||||||
|
# Disable deprecated interfaces
|
||||||
|
disableDeprecated=true
|
||||||
|
|
||||||
# Default site variables, must be set in initrc.local or _werc/config, only siteTitle is required.
|
# Default site variables, must be set in initrc.local or _werc/config, only siteTitle is required.
|
||||||
#masterSite=cat-v.org # Not required!
|
#masterSite=cat-v.org # Not required!
|
||||||
#siteTitle='cat-v'
|
#siteTitle='cat-v'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue