Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 3ebacb0025f5934ec22a3017ecdbe636daf90d62
https://github.com/phpmyadmin/phpmyadmin/commit/3ebacb0025f5934ec22a3017ecd…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-09 (Tue, 09 Feb 2016)
Changed paths:
M ChangeLog
M libraries/Config.php
M libraries/common.inc.php
M libraries/config/ConfigFile.php
M test/libraries/core/PMA_getTableCount_test_dis.php
Log Message:
-----------
Simplify loading of vendor configuration
Do it just once and very early, so that all scripts can rely on it being
available.
Fixes autoloading of phpseclib.
Fixes #11914
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: a6b4735aee6763b52166b441368fa5c3b5cf519d
https://github.com/phpmyadmin/phpmyadmin/commit/a6b4735aee6763b52166b441368…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-09 (Tue, 09 Feb 2016)
Changed paths:
M ChangeLog
M libraries/Config.php
M libraries/common.inc.php
M libraries/config/ConfigFile.php
M test/libraries/core/PMA_getTableCount_test_dis.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/b496cec40c75...a6b4735aee67