Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correção de instalação no Lazarus #339

Merged
merged 4 commits into from
May 17, 2023
Merged

Correção de instalação no Lazarus #339

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bad6edb
- Correção de instalação no Lazarus
mobius1qwe May 17, 2023
99fff50
Merge remote-tracking branch 'upstream/dev' into dev
mobius1qwe May 17, 2023
5c2f562
- Ajuste de merge
mobius1qwe May 17, 2023
7b90704
Merge remote-tracking branch 'upstream/dev' into dev
mobius1qwe May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CORE/Source/Basic/uRESTDWBasic.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2732,7 +2732,7 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
vRequestHeader.Add(Url + '?' + QueryParams);
TRESTDWDataUtils.ParseRESTURL (Url + '?' + QueryParams, vEncoding, vmark, vDatabaseCharSet, DWParams);
If DWParams.ItemsString['dwwelcomemessage'] <> Nil Then // Ico Menezes - Post Receber WelcomeMessage - 20-12-2018
vWelcomeMessage := DecodeStrings(DWParams.ItemsString['dwwelcomemessage'].AsString, vDatabaseCharSet;
vWelcomeMessage := DecodeStrings(DWParams.ItemsString['dwwelcomemessage'].AsString, vDatabaseCharSet);
End;
End
Else
Expand Down Expand Up @@ -3322,7 +3322,7 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
End
Else
Begin
{$IFDEF RESTDWLAZARUS}
{$IF Defined(RESTDWLAZARUS)}
If vEncoding = esUtf8 Then
mb := TStringStream.Create(Utf8Encode(JSONStr))
Else
Expand Down