The branch, QA_3_4 has been updated via ac430ea21d6f49b781a9cda9940a5675d56f168e (commit) from b6f02c7aed3af85a00fbf05c47a5ccade75fa076 (commit)

- Log ----------------------------------------------------------------- -----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + libraries/Error.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index b0fd2ef..2432fd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - patch #3430291 [import] Handle conflicts in some open_basedir situations - bug #3431427 [display] Dropdown results - setting NULL does not work - patch #3428764 [edit] Inline edit on multi-server configuration +- patch #3437354 [core] Notice: Array to string conversion in PHP 5.4

3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 2cfd5fe..595799b 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -175,7 +175,7 @@ class PMA_Error extends PMA_Message $this->getMessage() . $this->getFile() . $this->getLine() . - $this->getBacktrace() + serialize($this->getBacktrace()) ); }

hooks/post-receive