diff options
-rw-r--r-- | libs/README.md | 1 | ||||
-rw-r--r-- | libs/Zend/Session/Exception.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/README.md b/libs/README.md index 8d7c7d8e6e..333df17ceb 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 3269e12ce9..7152792aab 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 @@ class Zend_Session_Exception extends Zend_Exception */ 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; } } |