opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't encode html entities but escape quotes in JSON grid export. See http://www.heidisql.com/forum.php?t=22747#p22783

Browse Source
This commit is contained in:
Ansgar Becker
2016-11-26 15:10:55 +00:00
parent 50d74d9214
commit cdea0923b3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/exportgrid.pas
View File

@ -681,9 +681,9 @@ begin
// JavaScript Object Notation // JavaScript Object Notation
Header := '{' + CRLF; Header := '{' + CRLF;
if chkIncludeQuery.Checked then if chkIncludeQuery.Checked then
Header := Header + #9 + '"query": "'+HTMLSpecialChars(GridData.SQL)+'",' + CRLF Header := Header + #9 + '"query": '+EscapePHP(GridData.SQL)+',' + CRLF
else else
Header := Header + #9 + '"table": "'+HTMLSpecialChars(TableName)+'",' + CRLF ; Header := Header + #9 + '"table": '+EscapePHP(TableName)+',' + CRLF ;
Header := Header + #9 + '"rows":' + CRLF + #9 + '['; Header := Header + #9 + '"rows":' + CRLF + #9 + '[';
end; end;
@ -831,17 +831,15 @@ begin
efJSON: begin efJSON: begin
tmp := tmp + #9#9#9; tmp := tmp + #9#9#9;
if chkIncludeColumnNames.Checked then if chkIncludeColumnNames.Checked then
tmp := tmp + EscapePHP(HTMLSpecialChars(Grid.Header.Columns[Col].Text)) + ': '; tmp := tmp + EscapePHP(Grid.Header.Columns[Col].Text) + ': ';
if GridData.IsNull(Col) then if GridData.IsNull(Col) then
tmp := tmp + 'null,' +CRLF tmp := tmp + 'null,' +CRLF
else begin else begin
case GridData.DataType(Col).Category of case GridData.DataType(Col).Category of
dtcInteger, dtcReal: dtcInteger, dtcReal:
tmp := tmp + data; tmp := tmp + Data;
dtcBinary, dtcSpatial:
tmp := tmp + EscapePHP(Data);
else else
tmp := tmp + EscapePHP(HTMLSpecialChars(Data)) tmp := tmp + EscapePHP(Data)
end; end;
tmp := tmp + ',' + CRLF; tmp := tmp + ',' + CRLF;
end; end;