diff --git a/classesLib.pas b/classesLib.pas index 4fae958..13968e9 100644 --- a/classesLib.pas +++ b/classesLib.pas @@ -941,7 +941,7 @@ if sections.containsKey(section) then result:=sections[section] else 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); end; // getSection diff --git a/whatsnew.txt b/whatsnew.txt index 1bc1dae..1f39e3a 100644 --- a/whatsnew.txt +++ b/whatsnew.txt @@ -37,6 +37,7 @@ propaganda - 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 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 propaganda