fix: [file.EXT] not working

This commit is contained in:
Massimo Melina 2020-06-11 23:39:38 +02:00
parent 1f713f706e
commit f69251a482
3 changed files with 5 additions and 5 deletions

View File

@ -956,7 +956,7 @@ else
end; // getTxt end; // getTxt
function Ttpl.getTxtByExt(fileExt:string):string; function Ttpl.getTxtByExt(fileExt:string):string;
begin result:=getTxt('file.'+fileExt) end; begin result:=getTxt('file'+fileExt) end;
procedure Ttpl.fromString(txt:string); procedure Ttpl.fromString(txt:string);
var var

View File

@ -5610,7 +5610,6 @@ var
if (s > '') and f.isFolder() and not ansiStartsText('special:', s) then if (s > '') and f.isFolder() and not ansiStartsText('special:', s) then
with tplFromFile(f) do // temporarily builds from diff tpls with tplFromFile(f) do // temporarily builds from diff tpls
try try
// NB: section [] is not accessible, because of the s>'' test
section:=getsection(s); section:=getsection(s);
if assigned(section) and not section.nourl then // it has to exist and be accessible if assigned(section) and not section.nourl then // it has to exist and be accessible
begin begin
@ -5619,7 +5618,8 @@ var
getPage(s, data, f, me()); getPage(s, data, f, me());
exit; exit;
end; end;
finally free end; finally free
end;
if f.isFolder() and not (FA_BROWSABLE in f.flags) if f.isFolder() and not (FA_BROWSABLE in f.flags)
and stringExists(urlCmd,['','~folder.tar','~files.lst']) then and stringExists(urlCmd,['','~folder.tar','~files.lst']) then

View File

@ -1932,7 +1932,7 @@ try
disconnect(); disconnect();
if name = 'stop server' then if name = 'stop server' then
- begin begin
stopServer(); stopServer();
exit(''); exit('');
end; end;