From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 12 Feb 2010 04:44:43 +0000 (-0700)
Subject: Identity:: -> Horde_Prefs_Identity::
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fc2852d4c1a337f1d2f83362ef93d4429a8139f5;p=horde.git

Identity:: -> Horde_Prefs_Identity::
---

diff --git a/whups/lib/Mail.php b/whups/lib/Mail.php
index 07dc6337c..f7c3dc339 100644
--- a/whups/lib/Mail.php
+++ b/whups/lib/Mail.php
@@ -211,13 +211,11 @@ class Whups_Mail {
     {
         global $conf;
 
-        require_once 'Horde/Identity.php';
+        $auth = Horde_Auth::singleton($conf['auth']['driver'], Horde::getDriverConfig('auth', $conf['auth']['driver']));
 
-        $params = Horde::getDriverConfig('auth', $conf['auth']['driver']);
-        $auth = Horde_Auth::singleton($conf['auth']['driver'], $params);
         if ($auth->hasCapability('list')) {
             foreach ($auth->listUsers() as $user) {
-                $identity = &Identity::singleton('none', $user);
+                $identity = Horde_Prefs_Identity::singleton('none', $user);
                 $addrs = $identity->getAll('from_addr');
                 foreach ($addrs as $addr) {
                     if (strcasecmp($from, $addr) == 0) {