holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix IDE warnings

Browse Source
This commit is contained in:
Ralf Becker 2017-09-08 14:57:02 +02:00
parent e456f7800c
commit 23e654ab89
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/Contacts.php
View File

@ -734,7 +734,7 @@ class Contacts extends Contacts\Storage
$data[$name] = DateTime::server2user($data[$name], $date_format); $data[$name] = DateTime::server2user($data[$name], $date_format);
} }
} }
$data['photo'] = $this->photo_src($data['id'],$data['jpegphoto'],'',$data['etag']); $data['photo'] = $this->photo_src($data['id'],$data['jpegphoto'] || $data['files'] & self::FILES_PHOTO,'',$data['etag']);
// set freebusy_uri for accounts // set freebusy_uri for accounts
if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup'])) if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup']))
@ -1711,8 +1711,7 @@ class Contacts extends Contacts\Storage
*/ */
public function read_birthdays($addressbook, $year) public function read_birthdays($addressbook, $year)
{ {
$birthdays = Cache::getInstance(__CLASS__,"birthday-$year-$addressbook"); if (($birthdays = Cache::getInstance(__CLASS__,"birthday-$year-$addressbook")) !== null)
if($birthdays !== null)
{ {
return $birthdays; return $birthdays;
} }
@ -1724,7 +1723,7 @@ class Contacts extends Contacts\Storage
'bday' => "!''", 'bday' => "!''",
); );
$bdays =& $this->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'), $bdays =& $this->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
'contact_bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter); 'contact_bday ASC', '', '', false, 'AND', false, $filter);
if ($bdays) if ($bdays)
{ {