fixed PHP 5.4 Warning: Illegal string offset

This commit is contained in:
Ralf Becker 2012-05-21 10:57:16 +00:00
parent f80477e938
commit 28de768d68
3 changed files with 3 additions and 3 deletions

View File

@ -116,7 +116,7 @@ class link_widget
{
$extension_data['type'] = $type = $cell['type'];
$extension_data['needed'] = $cell['needed'];
$help = $cell['help'] ? ($value['help'] ? $value['help'] : $cell['help']) : lang('view this linked entry in its application');
$help = $cell['help'] ? (is_array($value) && !empty($value['help']) ? $value['help'] : $cell['help']) : lang('view this linked entry in its application');
if ((in_array($type,array('link-to','link-add','link-entry')) && !$value) && ($cell['readonly'] || $readonlys))
{

View File

@ -481,7 +481,7 @@ class egw_link extends solink
{
foreach($targets as $link)
{
$app_ids[$link['app']][] = $link['id'];
if (is_array($link)) $app_ids[$link['app']][] = $link['id'];
}
}
foreach($app_ids as $app => $a_ids)

View File

@ -223,7 +223,7 @@
}
$prefs[$var] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
if($notifies[$var]) // need to translate the key-words back
if(is_array($notifies) && isset($notifies[$var])) // need to translate the key-words back
{
$prefs[$var] = $GLOBALS['egw']->preferences->lang_notify($prefs[$var],$notifies[$var],True);
}