From 4147c870acbac070bd7316a343824f015d06c9c8 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 13 Jan 2015 15:47:50 +1300 Subject: [PATCH] Fix #6980 "Array to string conversion" notice --- libs/README.md | 1 + libs/Zend/Session/Exception.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/README.md b/libs/README.md index 8d7c7d8e6e7..333df17ceb0 100644 --- a/libs/README.md +++ b/libs/README.md @@ -31,3 +31,4 @@ third-party libraries: - strip require_once (to support autoloading) - in r3694, fix ZF-10888 and ZF-10835 - ZF-10871 - undefined variables when socket support disabled + - fix #6980 ("Array to string conversion") in `Zend/Session/Exception.php` diff --git a/libs/Zend/Session/Exception.php b/libs/Zend/Session/Exception.php index 3269e12ce97..7152792aab5 100644 --- a/libs/Zend/Session/Exception.php +++ b/libs/Zend/Session/Exception.php @@ -55,7 +55,7 @@ class Zend_Session_Exception extends Zend_Exception */ static public function handleSessionStartError($errno, $errstr, $errfile, $errline, $errcontext) { - self::$sessionStartError = $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr . ' ' . $errcontext; + self::$sessionStartError = $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr; } /** @@ -68,7 +68,7 @@ static public function handleSessionStartError($errno, $errstr, $errfile, $errli */ static public function handleSilentWriteClose($errno, $errstr, $errfile, $errline, $errcontext) { - self::$sessionStartError .= PHP_EOL . $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr . ' ' . $errcontext; + self::$sessionStartError .= PHP_EOL . $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr; } }