From 6b113a159d56b0a7d8793d96cc2d477df590d9eb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 10 May 2013 18:00:33 +0000
Subject: [PATCH] preserve was not set

---
 preferences/inc/class.preferences_settings.inc.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/preferences/inc/class.preferences_settings.inc.php b/preferences/inc/class.preferences_settings.inc.php
index 3cc5704f67..8f56719f9e 100644
--- a/preferences/inc/class.preferences_settings.inc.php
+++ b/preferences/inc/class.preferences_settings.inc.php
@@ -105,15 +105,11 @@ class preferences_settings
 			$GLOBALS['egw']->preferences->set_account_id($account_id);
 			$GLOBALS['egw']->preferences->read_repository();
 		}
-		$preserve = array(
-			'appname' => $content['appname'],
-			'type' => $content['type'],
-			'old_appname' => $content['appname'],
-			'old_type' => $content['type'],
-			'types' => array(),
-		);
+		$preserve = array('types' => array());
 		if ($content['old_appname'] == $content['appname']) $old_tab = $content['tabs'];
 		$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 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,
 				'onchange' => $setting['onchange'],
 			);
+			//error_log("appname=$appname, attribute=$attribute, setting=".array2string($setting));
 			$content[$tab][$setting['name']] = $GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']];
 			//if ($old_type == 'multiselect') $content[$tab][$setting['name']] = explode(',', $content[$tab][$setting['name']]);
 		}