extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove wrong settings definition, causing an illegal string offset in preferences

Browse Source
This commit is contained in:
Ralf Becker 2014-07-24 09:53:04 +00:00
parent 1266aeb52a
commit 19651fcb9b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/inc/class.mail_hooks.inc.php
View File

@ -476,7 +476,6 @@ class mail_hooks
'admin' => False, 'admin' => False,
'default'=> 'text', 'default'=> 'text',
), ),
'add_popup' => '870x800',
); );
if (!$GLOBALS['egw_info']['apps']['stylite']) unset($settingsArray['attachVCardAtCompose']); if (!$GLOBALS['egw_info']['apps']['stylite']) unset($settingsArray['attachVCardAtCompose']);
return $settingsArray; return $settingsArray;

2
preferences/inc/class.preferences_settings.inc.php
View File

@ -623,7 +623,7 @@ class preferences_settings
// only set not yet set default prefs, so user is able to unset it again with "" // only set not yet set default prefs, so user is able to unset it again with ""
// (only works with type vfs_*, other types delete empty values!) // (only works with type vfs_*, other types delete empty values!)
if (!isset($GLOBALS['egw']->preferences->default[$appname][$name]) && if (!isset($GLOBALS['egw']->preferences->default[$appname][$name]) &&
((string)$data['default'] !== '' || (string)$data['forced'] !== '')) ((string)$data['default'] !== '' || (string)$data['forced'] !== ''))
{ {
$default = (string)$data['forced'] !== '' ? $data['forced'] : $data['default']; $default = (string)$data['forced'] !== '' ? $data['forced'] : $data['default'];
//echo "<p>".__METHOD__."($appname) $this->appname/$appname/$name=$default NOT yet set!</p>\n"; //echo "<p>".__METHOD__."($appname) $this->appname/$appname/$name=$default NOT yet set!</p>\n";