Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 38aba0406f84dde976856a990d9222384064a6cd https://github.com/phpmyadmin/phpmyadmin/commit/38aba0406f84dde976856a990d92... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M libraries/Error.class.php M libraries/php-gettext/gettext.inc
Log Message: ----------- Use DIRECTORY_SEPARATOR
The PATH_SEPARATOR is not the right variable...
Issue #11944
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9d1a5997cb6c2c9a6a2594fce6190fb63c74f53b https://github.com/phpmyadmin/phpmyadmin/commit/9d1a5997cb6c2c9a6a2594fce619... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M libraries/Error.class.php
Log Message: ----------- Correctly handle failing case
Issue #11953
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 2b3ef7ad99ff2a53a239423cb0485b8b624fdb06 https://github.com/phpmyadmin/phpmyadmin/commit/2b3ef7ad99ff2a53a239423cb048... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M test/classes/PMA_Error_test.php
Log Message: ----------- Improve test coverage for getting relative path
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b73855842b167f3d1c9e7e1a98ce8bfaca1a6c45 https://github.com/phpmyadmin/phpmyadmin/commit/b73855842b167f3d1c9e7e1a98ce... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M libraries/Error.php M libraries/php-gettext/gettext.inc M test/classes/ErrorTest.php
Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6
Commit: 4d00b58fa20de0eb0bb39e3c0e3b0827ec1048f9 https://github.com/phpmyadmin/phpmyadmin/commit/4d00b58fa20de0eb0bb39e3c0e3b... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M libraries/Error.php M libraries/php-gettext/gettext.inc M test/classes/ErrorTest.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ebc8e28226d0...4d00b58fa20d