extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed photo was lost after it was no longer transfered to client (to fix utf8 error in json encoding)

Browse Source
This commit is contained in:
Ralf Becker 2014-03-21 17:12:32 +00:00
parent fcc1737036
commit 93151d84a3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1710,7 +1710,11 @@ window.egw_LAB.wait(function() {
{ {
case 'save': case 'save':
case 'apply': case 'apply':
if ($content['delete_photo']) $content['jpegphoto'] = null; if ($content['delete_photo'])
{
$content['jpegphoto'] = null;
unset($content['delete_photo']);
}
if (is_array($content['upload_photo']) && !empty($content['upload_photo']['tmp_name']) && if (is_array($content['upload_photo']) && !empty($content['upload_photo']['tmp_name']) &&
$content['upload_photo']['tmp_name'] != 'none' && $content['upload_photo']['tmp_name'] != 'none' &&
($f = fopen($content['upload_photo']['tmp_name'],'r'))) ($f = fopen($content['upload_photo']['tmp_name'],'r')))
@ -1868,7 +1872,6 @@ window.egw_LAB.wait(function() {
{ {
$view = true; $view = true;
} }
$content['jpegphoto'] = !empty($content['jpegphoto']); // unused and messes up json encoding (not utf-8)
} }
else // not found else // not found
{ {
@ -2093,6 +2096,7 @@ window.egw_LAB.wait(function() {
// allow other apps to add tabs to addressbook edit // allow other apps to add tabs to addressbook edit
$preserve = $content; $preserve = $content;
$content['jpegphoto'] = !empty($content['jpegphoto']); // unused and messes up json encoding (not utf-8)
$this->tmpl->setElementAttribute('tabs', 'add_tabs', true); $this->tmpl->setElementAttribute('tabs', 'add_tabs', true);
$tabs =& $this->tmpl->getElementAttribute('tabs', 'tabs'); $tabs =& $this->tmpl->getElementAttribute('tabs', 'tabs');
if (true) $tabs = array(); if (true) $tabs = array();