From 23e654ab891ae9d2c4265290f0d7b14937437fe3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Fri, 8 Sep 2017 14:57:02 +0200
Subject: [PATCH] fix IDE warnings

---
 api/src/Contacts.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/api/src/Contacts.php b/api/src/Contacts.php
index 069c6861bb..d0d624517e 100755
--- a/api/src/Contacts.php
+++ b/api/src/Contacts.php
@@ -734,7 +734,7 @@ class Contacts extends Contacts\Storage
 				$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
 		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)
 	{
-		$birthdays = Cache::getInstance(__CLASS__,"birthday-$year-$addressbook");
-		if($birthdays !== null)
+		if (($birthdays = Cache::getInstance(__CLASS__,"birthday-$year-$addressbook")) !== null)
 		{
 			return $birthdays;
 		}
@@ -1724,7 +1723,7 @@ class Contacts extends Contacts\Storage
 			'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)
 		{