[eGroupWare-svn] r55987 - /trunk/egroupware/api/src/Preferences.php

Author: ralfbecker
Date: Mon May  2 22:24:16 2016
New Revision: 55987

URL: http://svn.stylite.de/viewvc/egroupware?rev=55987&view=rev
Log:
no need to instanciate object for static methods

Modified:
    trunk/egroupware/api/src/Preferences.php

Modified: trunk/egroupware/api/src/Preferences.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Preferences.php?rev=55987&r1=55986&r2=55987&view=diff
==============================================================================
--- trunk/egroupware/api/src/Preferences.php (original)
+++ trunk/egroupware/api/src/Preferences.php Mon May  2 22:24:16 2016
@@ -951,12 +951,12 @@
 			return $this->data['email']['address'];
 		}
 		// if email-address is set in the account, return it
-		if (($email = $GLOBALS['egw']->accounts->id2name($account_id,'account_email')))
+		if (($email = Accounts::id2name($account_id,'account_email')))
 		{
 			return $email;
 		}
-		$prefs_email_address = $GLOBALS['egw']->accounts->id2name($account_id);
-		if (strpos($prefs_email_address,'@') === False)
+		$prefs_email_address = Accounts::id2name($account_id);
+		if ($prefs_email_address && strpos($prefs_email_address,'@') === False)
 		{
 			$prefs_email_address .= '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
 		}


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z