Commit 3cf18133 authored by Benito van der Zander's avatar Benito van der Zander

fix last commit

parent cb89dbfb
...@@ -2917,11 +2917,8 @@ end; ...@@ -2917,11 +2917,8 @@ end;
procedure TTemplateReaderBreaker.setTemplate(atemplate: TMultiPageTemplate); procedure TTemplateReaderBreaker.setTemplate(atemplate: TMultiPageTemplate);
begin begin
if atemplate = nil then begin if template <> nil then FreeAndNil(template);
atemplate.free; if atemplate = nil then exit;
template:=nil;
exit;
end;
inherited setTemplate(atemplate); inherited setTemplate(atemplate);
end; end;
...@@ -3309,7 +3306,7 @@ procedure variableRead(pseudoself: TObject; sender: TObject; const name, value: ...@@ -3309,7 +3306,7 @@ procedure variableRead(pseudoself: TObject; sender: TObject; const name, value:
end; end;
var var
temps: String; temps, tempurl: String;
begin begin
if (name = 'follow') or (name = 'follow-file') //follow always create new processing context if (name = 'follow') or (name = 'follow-file') //follow always create new processing context
or ((name = '') and (value <> '[') and (value <> ']') //plain data/url or ((name = '') and (value <> '[') and (value <> ']') //plain data/url
...@@ -3377,8 +3374,8 @@ begin ...@@ -3377,8 +3374,8 @@ begin
i := pos('=', temps); i := pos('=', temps);
if i = 0 then xpathparser.StaticContext.defaultElementTypeNamespace := TNamespace.create(temps, '') if i = 0 then xpathparser.StaticContext.defaultElementTypeNamespace := TNamespace.create(temps, '')
else begin else begin
specialized := strSplitGet('=', temps); tempurl := strSplitGet('=', temps);
xpathparser.StaticContext.namespaces.add(TNamespace.create(temps, specialized)); xpathparser.StaticContext.namespaces.add(TNamespace.create(temps, tempurl));
end; end;
end else if (name = '') or (name = 'data') then begin end else if (name = '') or (name = 'data') then begin
if (name = '') and (value = '[') then begin if (name = '') and (value = '[') then begin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment