Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9d3f7519c990b3b4b34991b9cf8b1884ceef177b https://github.com/phpmyadmin/phpmyadmin/commit/9d3f7519c990b3b4b34991b9cf8b... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2019-12-21 (Sat, 12 December 2019) -03:00

Changed paths: M libraries/classes/DatabaseInterface.php

Log Message: ----------- Revert "Fix #14433 - "You do not have privileges to manipulate with the users!" on root superadmin"

This reverts commit b8650115be7cc2d79d231723b7a6f1961e834d27.

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev

Commit: 542ba3025a9272b9547a3fd3aabfb8711eed626a https://github.com/phpmyadmin/phpmyadmin/commit/542ba3025a9272b9547a3fd3aabf... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2019-12-21 (Sat, 12 December 2019) -03:00

Changed paths: M libraries/classes/DatabaseInterface.php M libraries/common.inc.php

Log Message: ----------- Fix control user issue

Partially reverts commit 2bc8afea5f47d0d409163754698ad13487410158.

Fixes #15608 Related to #14433

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev

Commit: f402a8f2cf8639c373ad4a1a7d7097568dd15c7d https://github.com/phpmyadmin/phpmyadmin/commit/f402a8f2cf8639c373ad4a1a7d70... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M libraries/classes/DatabaseInterface.php M libraries/common.inc.php

Log Message: ----------- Merge #15681 - Fix #15608 DisableIS is broken on pma 4.9.2 with controluser configured

Fixes: #15608 Pull-request: #15681 Ref: 2bc8afea5f47d0d409163754698ad13487410158 Signed-off-by: William Desportes williamdes@wdes.fr

Commit: a1acccdf59897f005f1168fee74d5dc1063fa3fc https://github.com/phpmyadmin/phpmyadmin/commit/a1acccdf59897f005f1168fee74d... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #15608

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 9633175165a6e7904cb69a8f1965b9379bc00d7f https://github.com/phpmyadmin/phpmyadmin/commit/9633175165a6e7904cb69a8f1965... Author: William Desportes williamdes@wdes.fr Date: 2019-12-21 (Sat, 12 December 2019) +01:00

Changed paths: M ChangeLog M libraries/classes/DatabaseInterface.php M libraries/common.inc.php

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

Signed-off-by: William Desportes williamdes@wdes.fr