paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 01:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 51096 #13baa543c5 from trunk:

Browse Source 
LHelp: Fix incorrect processing of internal links specified by absolute paths (issue #29267)
........

git-svn-id: branches/fixes_1_6@51150 -
This commit is contained in:
maxim 2016-01-03 12:36:44 +00:00
parent 36a750c573
commit 8372e32c07
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/chmhelp/lhelp/chmdataprovider.pas
View File

@ -187,7 +187,9 @@ begin
if Pos('ms-its:', NewURL) = 1 then begin if Pos('ms-its:', NewURL) = 1 then begin
if Pos('#', NewURL) = 0 then if Pos('#', NewURL) = 0 then
exit; exit;
X := Pos('::', fNewURL); X := Pos('::', NewURL);
if NewURL[X+2] = '/' then // NewURL is complete and absolute --> nothing to do
exit;
fNewURL := Copy(fNewURL, X+3, MaxInt); fNewURL := Copy(fNewURL, X+3, MaxInt);
end; end;
@ -230,6 +232,7 @@ var
begin begin
Result := TStringList.Create; Result := TStringList.Create;
Result.Delimiter := '/'; Result.Delimiter := '/';
Result.StrictDelimiter := true;
Result.DelimitedText := ADir; Result.DelimitedText := ADir;
LastName := ExtractFileName(ADir); LastName := ExtractFileName(ADir);