From f9dd120d32bbb491a9b3014027134a61899fca43 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 20 Feb 2019 17:07:28 +0100 Subject: [PATCH] * Addressbook: fix photo was lost when non-admin user edited own account --- addressbook/inc/class.addressbook_ui.inc.php | 3 +-- addressbook/templates/default/edit.xet | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index e7e4d36074..548d94816c 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -2511,8 +2511,7 @@ window.egw_LAB.wait(function() { // allow other apps to add tabs to addressbook edit $preserve = $content; - unset($preserve['jpegphoto']); - $content['jpegphoto'] = !empty($content['jpegphoto']); // unused and messes up json encoding (not utf-8) + unset($preserve['jpegphoto'], $content['jpegphoto']); // unused and messes up json encoding (not utf-8) $this->tmpl->setElementAttribute('tabs', 'add_tabs', true); $tabs =& $this->tmpl->getElementAttribute('tabs', 'tabs'); if (($first_call = !isset($tabs))) diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet index 6deded9db0..253ae6e99b 100644 --- a/addressbook/templates/default/edit.xet +++ b/addressbook/templates/default/edit.xet @@ -349,7 +349,7 @@ - +