fix: empty tpl sections were not overriding

This commit is contained in:
Massimo Melina 2020-06-11 11:35:28 +02:00
parent 7634b96744
commit 4b5e0205a5
2 changed files with 2 additions and 1 deletions

View File

@ -941,7 +941,7 @@ if sections.containsKey(section) then
result:=sections[section] result:=sections[section]
else else
result:=NIL; result:=NIL;
if inherit and assigned(over) and ((result = NIL) or (trim(result.txt) = '')) then if inherit and assigned(over) and (result = NIL) then
result:=over.getSection(section); result:=over.getSection(section);
end; // getSection end; // getSection

View File

@ -37,6 +37,7 @@ propaganda
- fixed double "Content-Length" header on compressed pages - fixed double "Content-Length" header on compressed pages
- fixed log text base color not matching system settings http://rejetto.com/forum/index.php?topic=13233.0 - fixed log text base color not matching system settings http://rejetto.com/forum/index.php?topic=13233.0
- fixed while renaming a file in the GUI, CTRL+C/V didn't work on the text - fixed while renaming a file in the GUI, CTRL+C/V didn't work on the text
- fixed diff tpl logic: an empty section will now override the inherited one
VER 2.3m VER 2.3m
propaganda propaganda