From 6651f0efc448c8e1beb71b0440ae5d27d03025de Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 13 Dec 2007 23:46:44 +0000
Subject: [PATCH] fixed problem in setup, because of not instanciated account
 object

---
 setup/inc/class.setup_cmd.inc.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setup/inc/class.setup_cmd.inc.php b/setup/inc/class.setup_cmd.inc.php
index 987a2a58f0..34e42349c6 100644
--- a/setup/inc/class.setup_cmd.inc.php
+++ b/setup/inc/class.setup_cmd.inc.php
@@ -95,6 +95,8 @@ abstract class setup_cmd extends admin_cmd
 	 */
 	static protected $egw_setup;
 	
+	static private $egw_accounts_backup;
+	
 	/**
 	 * Create the setup enviroment (for running within setup or eGW)
 	 */
@@ -114,6 +116,11 @@ abstract class setup_cmd extends admin_cmd
 			$header = $cmd->run();
 			$GLOBALS['egw_domain'] = $header['egw_domain'];
 			
+			if (is_object($GLOBALS['egw']->accounts) && is_null(self::$egw_accounts_backup))
+			{
+				self::$egw_accounts_backup = $GLOBALS['egw']->accounts;
+				unset($GLOBALS['egw']->accounts);
+			}
 			if ($this->config) self::$egw_setup->setup_account_object($this->config);
 		}
 		if (is_object($GLOBALS['egw']->db) && $domain)
@@ -147,6 +154,11 @@ abstract class setup_cmd extends admin_cmd
 				$GLOBALS['egw_info']['server']['db_pass'],
 				$GLOBALS['egw_info']['server']['db_type']
 			);
+			if (!is_null(self::$egw_accounts_backup))
+			{
+				$GLOBALS['egw']->accounts = self::$egw_accounts_backup;
+				unset(self::$egw_accounts_backup);
+			}
 		}
 	}