From ecd07d3720cd8367cec141ba6dddd726fc7dbb13 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 21 Sep 2009 14:43:19 +0200
Subject: [PATCH] Use the more complete toString() output if available.

---
 framework/Core/lib/Horde.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index d272a203f..3bd559dfc 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -108,9 +108,12 @@ class Horde
                 }
                 $message .= ': ' . $userinfo;
             }
-        } elseif (is_object($message) &&
-                  is_callable(array($message, 'getMessage'))) {
-            $message = $message->getMessage();
+        } elseif (is_object($message)) {
+            if (is_callable(array($message, 'toString'))) {
+                $message = $message->toString();
+            } elseif (is_callable(array($message, 'getMessage'))) {
+                $message = $message->getMessage();
+            }
         }
 
         $app = isset($GLOBALS['registry'])
-- 
2.11.0