Make sure that $user_prefs is always defined when necessary.

Bug: 13731
horde · Dec 5, 2014 · eab6578 · eab6578
1 parent 02976b8
commit eab6578
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/whups/lib/Driver.php b/whups/lib/Driver.php
@@ -511,13 +511,13 @@ public function mail(array $opts)
             }
 
             if ($details &&
-                $details['type'] == 'user' &&
-                ($details['user'] == $registry->getAuth() ||
-                 !$registry->getAuth())) {
+                $details['type'] == 'user') {
                 $user_prefs = $GLOBALS['injector']
                     ->getInstance('Horde_Core_Factory_Prefs')
                     ->create('whups', array('user' => $details['user']));
-                if ($from['type'] == 'user' &&
+                if (($details['user'] == $registry->getAuth() ||
+                     (!$registry->getAuth())) &&
+                    $from['type'] == 'user' &&
                     $details['user'] == $from['user'] &&
                     $user_prefs->getValue('email_others_only')) {
                     continue;