extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-22 21:30:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid some 'array_key_exists() expects parameter 2 to be array' warnings by checking first

Browse Source
This commit is contained in:
nathangray 2020-10-13 15:20:33 -06:00
parent a0065835a6
commit 05ee7eba37
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_cmd_customfield.inc.php
View File

@ -89,7 +89,7 @@ class admin_cmd_customfield extends admin_cmd
unset($old['modified'], $old['modifier'], $old['tab']); unset($old['modified'], $old['modifier'], $old['tab']);
foreach($set as $key => $value) foreach($set as $key => $value)
{ {
if(array_key_exists($key, $old) && $old[$key] == $value) if(is_array($old) && array_key_exists($key, $old) && $old[$key] == $value)
{ {
// Need to keep these 2 in set so we can tell if it was deleted // Need to keep these 2 in set so we can tell if it was deleted
if(!in_array($key, array('id','name'))) if(!in_array($key, array('id','name')))

2
api/src/Etemplate/Widget/Customfields.php
View File

@ -332,7 +332,7 @@ class Customfields extends Transformer
); );
foreach($defaults as $f => $d_value) foreach($defaults as $f => $d_value)
{ {
$widget->attrs[$f] = array_key_exists($f, $field['values']) ? $field['values'][$f] : $d_value; $widget->attrs[$f] = is_array($field['values']) && array_key_exists($f, $field['values']) ? $field['values'][$f] : $d_value;
} }
break; break;