From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Mon, 19 Jul 2010 14:26:18 +0000 (-0400)
Subject: No more PEAR_Error
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dad133825fb50c49992e65ebe16b167519c08f0e;p=horde.git

No more PEAR_Error
---

diff --git a/framework/Block/lib/Horde/Block/Collection.php b/framework/Block/lib/Horde/Block/Collection.php
index 4568f570e..650187148 100644
--- a/framework/Block/lib/Horde/Block/Collection.php
+++ b/framework/Block/lib/Horde/Block/Collection.php
@@ -424,9 +424,6 @@ class Horde_Block_Collection
     {
         if (!isset($this->_blocks[$app][$block]['params'])) {
             $blockOb = $this->getBlock($app, $block);
-            if ($blockOb instanceof PEAR_Error) {
-                return $blockOb;
-            }
             $this->_blocks[$app][$block]['params'] = $blockOb->getParams();
         }
 
diff --git a/framework/Block/lib/Horde/Block/Layout/View.php b/framework/Block/lib/Horde/Block/Layout/View.php
index e94b96073..d2065928c 100644
--- a/framework/Block/lib/Horde/Block/Layout/View.php
+++ b/framework/Block/lib/Horde/Block/Layout/View.php
@@ -84,9 +84,6 @@ class Horde_Block_Layout_View extends Horde_Block_Layout
                         if ($block instanceof Horde_Block) {
                             $header = $block->getTitle();
                             $content = $block->getContent();
-                            if ($content instanceof PEAR_Error) {
-                                $content = $content->getMessage();
-                            }
                             if ($GLOBALS['browser']->hasFeature('xmlhttpreq')) {
                                 $refresh_time = isset($item['params']['params']['_refresh_time']) ? $item['params']['params']['_refresh_time'] : $interval;
                             }