Revert. Horde::callHook is still returning PEAR_Errors rather than raising Exceptions.

diff --git a/imp/lib/Session.php b/imp/lib/Session.php
index eef38f4..6f3e137 100644 (file)
--- a/imp/lib/Session.php
+++ b/imp/lib/Session.php
@@ -79,10 +79,9 @@ class IMP_Session
         /* Run the username through virtualhost expansion functions if
          * necessary. */
         if (!empty($conf['hooks']['vinfo'])) {
-            try {
-                $imapuser = Horde::callHook('_imp_hook_vinfo', array('username', $imapuser), 'imp');
-            } catch (Horde_Exception $e) {
-                Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+            $hook_user = Horde::callHook('_imp_hook_vinfo', array('username', $imapuser), 'imp');
+            if (!is_a($hook_user, 'PEAR_Error')) {
+                $imapuser = $hook_user;
             }
         }