holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preserve was not set

Browse Source
This commit is contained in:
Ralf Becker 2013-05-10 18:00:33 +00:00
parent a57ae54e82
commit 6b113a159d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,15 +105,11 @@ class preferences_settings
$GLOBALS['egw']->preferences->set_account_id($account_id); $GLOBALS['egw']->preferences->set_account_id($account_id);
$GLOBALS['egw']->preferences->read_repository(); $GLOBALS['egw']->preferences->read_repository();
} }
$preserve = array( $preserve = array('types' => array());
'appname' => $content['appname'],
'type' => $content['type'],
'old_appname' => $content['appname'],
'old_type' => $content['type'],
'types' => array(),
);
if ($content['old_appname'] == $content['appname']) $old_tab = $content['tabs']; if ($content['old_appname'] == $content['appname']) $old_tab = $content['tabs'];
$content = $this->get_content($appname, $type, $sel_options, $readonlys, $preserve['types'], $tpl); $content = $this->get_content($appname, $type, $sel_options, $readonlys, $preserve['types'], $tpl);
$preserve['appname'] = $preserve['old_appname'] = $content['appname'];
$preserve['type'] = $preserve['old_type'] = $content['type'];
if (isset($old_tab)) $content['tabs'] = $old_tab; if (isset($old_tab)) $content['tabs'] = $old_tab;
// if not just saved, call validation before, to be able to show failed validation of current prefs // if not just saved, call validation before, to be able to show failed validation of current prefs
@ -398,6 +394,7 @@ class preferences_settings
'default' => !empty($default) ? lang('Default').': '.$default : null, 'default' => !empty($default) ? lang('Default').': '.$default : null,
'onchange' => $setting['onchange'], 'onchange' => $setting['onchange'],
); );
//error_log("appname=$appname, attribute=$attribute, setting=".array2string($setting));
$content[$tab][$setting['name']] = $GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']]; $content[$tab][$setting['name']] = $GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']];
//if ($old_type == 'multiselect') $content[$tab][$setting['name']] = explode(',', $content[$tab][$setting['name']]); //if ($old_type == 'multiselect') $content[$tab][$setting['name']] = explode(',', $content[$tab][$setting['name']]);
} }