From 19651fcb9b478adf44a453b2c969716294bfa52d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 24 Jul 2014 09:53:04 +0000 Subject: [PATCH] remove wrong settings definition, causing an illegal string offset in preferences --- mail/inc/class.mail_hooks.inc.php | 1 - preferences/inc/class.preferences_settings.inc.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php index 55e34a9e75..d18582f211 100644 --- a/mail/inc/class.mail_hooks.inc.php +++ b/mail/inc/class.mail_hooks.inc.php @@ -476,7 +476,6 @@ class mail_hooks 'admin' => False, 'default'=> 'text', ), - 'add_popup' => '870x800', ); if (!$GLOBALS['egw_info']['apps']['stylite']) unset($settingsArray['attachVCardAtCompose']); return $settingsArray; diff --git a/preferences/inc/class.preferences_settings.inc.php b/preferences/inc/class.preferences_settings.inc.php index 5c6227802f..566027753b 100644 --- a/preferences/inc/class.preferences_settings.inc.php +++ b/preferences/inc/class.preferences_settings.inc.php @@ -623,7 +623,7 @@ class preferences_settings // 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!) 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']; //echo "

".__METHOD__."($appname) $this->appname/$appname/$name=$default NOT yet set!

\n";