[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-22603-g09f983f

[Marc Delisle]

The branch, master has been updated
       via  09f983ff8323ce0001f012873eecafa70585a97e (commit)
       via  584fa4d2c8aa465a97db53cdb5d5df3ed61a69cc (commit)
       via  ac430ea21d6f49b781a9cda9940a5675d56f168e (commit)
       via  b6f02c7aed3af85a00fbf05c47a5ccade75fa076 (commit)
      from  fc2ee11a33acf90af83eff483d104067f5840939 (commit)


- Log -----------------------------------------------------------------
commit 09f983ff8323ce0001f012873eecafa70585a97e
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Nov 15 12:49:37 2011 -0500

    Fix merge conflicts

commit 584fa4d2c8aa465a97db53cdb5d5df3ed61a69cc
Merge: fc2ee11 ac430ea
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Nov 15 12:48:29 2011 -0500

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

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

diff --git a/ChangeLog b/ChangeLog
index 2c9b63b..f528816 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,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 d332b06..65fa1fc 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -158,7 +158,7 @@ class PMA_Error extends PMA_Message
                 $this->getMessage() .
                 $this->getFile() .
                 $this->getLine() .
-                $this->getBacktrace()
+                serialize($this->getBacktrace())
             );
         }
 


hooks/post-receive
-- 
phpMyAdmin