[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 00d90b: Fix #14548 [security] HTML injection in import warning messages

[Madhura Jayaratne]

Branch: refs/tags/RELEASE_4_8_3
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 00d90b3ae415b31338f76263359467a9fbebd0a1
https://github.com/phpmyadmin/phpmyadmin/commit/00d90b3ae415b31338f76263359467a9fbebd0a1
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2018-08-18 (Sat, 08 August 2018) +10:00

Changed paths: 
M ChangeLog
M libraries/classes/Sql.php

Log Message:
-----------
Fix #14548 [security] HTML injection in import warning messages

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

Commit: 8154e23139cb3262aa6a9ff79437d5a909f97d52
https://github.com/phpmyadmin/phpmyadmin/commit/8154e23139cb3262aa6a9ff79437d5a909f97d52
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2018-08-22 (Wed, 08 August 2018) -04:00

Changed paths: 
M ChangeLog
M libraries/classes/Sql.php

Log Message:
-----------
Fix merge conflicts in ChangeLog

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: dc45b8aa04c473956561013b1e5d60a31e499518
https://github.com/phpmyadmin/phpmyadmin/commit/dc45b8aa04c473956561013b1e5d60a31e499518
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2018-08-22 (Wed, 08 August 2018) -04:00

Changed paths: 
M ChangeLog
M libraries/classes/Sql.php

Log Message:
-----------
Merge branch 'madhuracj-bug14548' into QA_4_8

Commit: 8bac4a931b711d7dd0f417d41f21a48762b63c72
https://github.com/phpmyadmin/phpmyadmin/commit/8bac4a931b711d7dd0f417d41f21a48762b63c72
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2018-08-22 (Wed, 08 August 2018) -04:00

Changed paths: 
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php
M package.json

Log Message:
-----------
Prepare for version 4.8.3

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: 41283ff07959449017a4d660fdaa81906bf5c8b0
https://github.com/phpmyadmin/phpmyadmin/commit/41283ff07959449017a4d660fdaa81906bf5c8b0
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2018-08-22 (Wed, 08 August 2018) -04:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add PMASA to ChangeLog

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: b838363dc3bc8d85f50a9da0bf1f1b90e10d9b13
https://github.com/phpmyadmin/phpmyadmin/commit/b838363dc3bc8d85f50a9da0bf1f1b90e10d9b13
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2018-08-22 (Wed, 08 August 2018) -04:00

Changed paths: 
A composer.lock

Log Message:
-----------
Adding composer lock for 4.8.3

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>