extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

do NOT try to read empty contact_id

Browse Source 
it wont find anything anyway, but gives an exception under AD, because of wrong formated GUID
This commit is contained in:
Ralf Becker 2019-01-28 10:01:12 +01:00
parent 32095efd4b
commit fdfcc15c6b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_widget_image.js
View File

@ -525,7 +525,7 @@ var et2_avatar = (function(){ "use strict"; return et2_image.extend(
{ {
this._super.apply(this,arguments); this._super.apply(this,arguments);
var self = this; var self = this;
if (this.options.editable) if (this.options.contact_id && this.options.editable)
{ {
egw(window).json( egw(window).json(
'addressbook.addressbook_ui.ajax_noPhotoExists', 'addressbook.addressbook_ui.ajax_noPhotoExists',

4
api/src/Contacts/Storage.php
View File

@ -603,6 +603,10 @@ class Storage
*/ */
function read($contact_id) function read($contact_id)
{ {
if (empty($contact_id))
{
return false; // no need to pass to backend, will fail anyway
}
if (!is_array($contact_id) && substr($contact_id,0,8) == 'account:') if (!is_array($contact_id) && substr($contact_id,0,8) == 'account:')
{ {
$contact_id = array('account_id' => (int) substr($contact_id,8)); $contact_id = array('account_id' => (int) substr($contact_id,8));