Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a294026e3799eefa195b89f5833e44ddeb7eb503 https://github.com/phpmyadmin/phpmyadmin/commit/a294026e3799eefa195b89f5833e... Author: Michal Čihař michal@cihar.com Date: 2016-08-03 (Wed, 03 Aug 2016)
Changed paths: M libraries/config/Validator.php
Log Message: ----------- Simplified getting error from preg_match
It's enough to use error_get_last to obtain the message without need to play with PHP configuration and error handling.
The only tricky thing is to know that there is new error. With PHP 7, there is error_clear_last() which ensures this, on older PHP we need to trigger *another* error to be able to detect that new error comes.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: d5139a52d9b6d7103107d40702dd3fc9d5322463 https://github.com/phpmyadmin/phpmyadmin/commit/d5139a52d9b6d7103107d40702dd... Author: Michal Čihař michal@cihar.com Date: 2016-08-03 (Wed, 03 Aug 2016)
Changed paths: M libraries/config/Validator.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/88b817a04297...d5139a52d9b6
-
Michal Čihař