From 29ab608461dcd12bf5bf9f5240863fff012b7002 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Mon, 19 Jul 2010 10:22:17 -0400
Subject: [PATCH] Need to catch Horde_Block_Exception here so we return to the
 proper application scope

---
 framework/Block/lib/Horde/Block.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/framework/Block/lib/Horde/Block.php b/framework/Block/lib/Horde/Block.php
index d960286c8..f0fb1130d 100644
--- a/framework/Block/lib/Horde/Block.php
+++ b/framework/Block/lib/Horde/Block.php
@@ -132,8 +132,11 @@ class Horde_Block
             return $e->getMessage();
         }
 
-        $title = $this->_title();
-
+        try {
+            $title = $this->_title();
+        } catch (Horde_Block_Exception $e) {
+            $title = $e->getMessage();
+        }
         /* If we changed application context in the course of this
          * call, undo that change now. */
         if ($app_pushed) {
@@ -172,7 +175,11 @@ class Horde_Block
             return $e->getMessage();
         }
 
-        $content = $this->_content();
+        try {
+            $content = $this->_content();
+        } catch (Horde_Block_Exception $e) {
+            $content = $e->getMessage();
+        }
 
         /* If we changed application context in the course of this
          * call, undo that change now. */
-- 
2.11.0