From f8cf1cc241a0cccac5838b030c3d8289f7307b12 Mon Sep 17 00:00:00 2001
From: Mehdi Achour <didou@php.net>
Date: Mon, 28 Jun 2004 15:53:36 +0000
Subject: [PATCH] fix for #25543 : set_error_handler returns mixed

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@162242 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../errorfunc/functions/set-error-handler.xml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/reference/errorfunc/functions/set-error-handler.xml b/reference/errorfunc/functions/set-error-handler.xml
index d9a415845f..b8988a174d 100644
--- a/reference/errorfunc/functions/set-error-handler.xml
+++ b/reference/errorfunc/functions/set-error-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.21 $ -->
+<!-- $Revision: 1.22 $ -->
 <!-- splitted from ./en/functions/errorfunc.xml, last change in rev 1.1 -->
   <refentry id="function.set-error-handler">
    <refnamediv>
@@ -11,17 +11,22 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>string</type><methodname>set_error_handler</methodname>
+      <type>mixed</type><methodname>set_error_handler</methodname>
       <methodparam><type>callback</type><parameter>error_handler</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>error_types</parameter></methodparam>
      </methodsynopsis>
     <para>
      Sets a user function (<parameter>error_handler</parameter>) to handle
-     errors in a script. Returns the previously defined error handler (if
-     any), or &false; on error. This function can be used for defining your own
-     way of handling errors during runtime, for example in applications in
-     which you need to do cleanup of data/files when a critical error happens,
-     or when you need to trigger an error under certain conditions (using
+     errors in a script. Returns a string containing the previously defined
+     error handler (if any), or &false; on error. If the previous handler
+     was a class method, this function will return an indexed array with
+     the class and the method name.
+    </para>
+    <para>
+     This function can be used for defining your own way of handling errors 
+     during runtime, for example in applications in which you need to do
+     cleanup of data/files when a critical error happens, or when you need
+     to trigger an error under certain conditions (using
      <function>trigger_error</function>).
     </para>
     <para>