Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f5e8953356465d079cbb6b6f3445aca90c98d801 https://github.com/phpmyadmin/phpmyadmin/commit/f5e8953356465d079cbb6b6f3445... Author: Michal Čihař michal@cihar.com Date: 2016-06-17 (Fri, 17 Jun 2016)

Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php

Log Message: ----------- Share backtrace processing for debugging and error reporting

We want to achieve same thing in both cases - backtrace which is stripped from sensitive information, has reasonable size and can be read. Sharing the code will make it easier to fix possible problems and also will make both cases behave consistent.

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 3847cee0a439d3265816c7be84bc737d05482355 https://github.com/phpmyadmin/phpmyadmin/commit/3847cee0a439d3265816c7be84bc... Author: Michal Čihař michal@cihar.com Date: 2016-06-17 (Fri, 17 Jun 2016)

Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php

Log Message: ----------- Merge branch 'QA_4_6'

Commit: 4a9da1df40952a53ca947e8fc9ecbf824768d3cf https://github.com/phpmyadmin/phpmyadmin/commit/4a9da1df40952a53ca947e8fc9ec... Author: Michal Čihař michal@cihar.com Date: 2016-06-17 (Fri, 17 Jun 2016)

Changed paths: M test/classes/ErrorTest.php

Log Message: ----------- Adjust tests to new error reporting handling of objects

Signed-off-by: Michal Čihař michal@cihar.com

Commit: cdc7a6c6bfabf97b457e594924ba7125232f86f9 https://github.com/phpmyadmin/phpmyadmin/commit/cdc7a6c6bfabf97b457e594924ba... Author: Michal Čihař michal@cihar.com Date: 2016-06-17 (Fri, 17 Jun 2016)

Changed paths: M test/classes/ErrorTest.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/aea7654804a4...cdc7a6c6bfab