[phpMyAdmin Git] [phpmyadmin/phpmyadmin] db02ee: Fix #15996 - local setup doc links are broken

[William Desportes]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: db02eea620a59fc3f4e5b5d2563cb033450b133e
https://github.com/phpmyadmin/phpmyadmin/commit/db02eea620a59fc3f4e5b5d2563cb033450b133e
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-05-17 (Sun, 05 May 2020) +02:00

Changed paths: 
M libraries/classes/Config/FormDisplay.php
M libraries/classes/Sanitize.php
M libraries/classes/Util.php

Log Message:
-----------
Fix #15996 - local setup doc links are broken

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 13f04e5d9d00e11d0e42d269e51170895a1b624d
https://github.com/phpmyadmin/phpmyadmin/commit/13f04e5d9d00e11d0e42d269e51170895a1b624d
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-05-17 (Sun, 05 May 2020) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for #15996

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 7fc472215538ecc661bf0869e8ff126623d9c8ff
https://github.com/phpmyadmin/phpmyadmin/commit/7fc472215538ecc661bf0869e8ff126623d9c8ff
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-05-17 (Sun, 05 May 2020) +02:00

Changed paths: 
M libraries/classes/Import.php
M test/classes/ImportTest.php

Log Message:
-----------
Fix #16093 - Error importing utf-8 with bom sql file

Do not use mb_ functions they are sensible to mb_internal_encoding()

Fixes: #16093

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: c8e5ec43ab6a134dc181a7052ecf030d23389cc4
https://github.com/phpmyadmin/phpmyadmin/commit/c8e5ec43ab6a134dc181a7052ecf030d23389cc4
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-05-17 (Sun, 05 May 2020) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for #16093

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: dfa718c1c662dff0b168b1e4bde74f31e5260939
https://github.com/phpmyadmin/phpmyadmin/commit/dfa718c1c662dff0b168b1e4bde74f31e5260939
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-05-17 (Sun, 05 May 2020) +02:00

Changed paths: 
M ChangeLog
M libraries/classes/Config/FormDisplay.php
M libraries/classes/Html/MySQLDocumentation.php
M libraries/classes/Import.php
M libraries/classes/Sanitize.php
M psalm-baseline.xml
M test/classes/ImportTest.php

Log Message:
-----------
Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes at wdes.fr>