From 185133abe4be91be0e96610c5a60202be54ee675 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 5 Sep 2014 12:23:53 +0000
Subject: [PATCH] fixed check for extra ldap attributes to take into account
 current account-repository, to not show them for migrated instances

---
 admin/inc/class.admin_account.inc.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/inc/class.admin_account.inc.php b/admin/inc/class.admin_account.inc.php
index 907c98a704..f35583c704 100644
--- a/admin/inc/class.admin_account.inc.php
+++ b/admin/inc/class.admin_account.inc.php
@@ -80,7 +80,10 @@ class admin_account
 					'loginshell' => $GLOBALS['egw_info']['server']['ldap_account_shell'],
 				);
 			}
-			$account['ldap_extra_attributes'] = $GLOBALS['egw_info']['server']['ldap_extra_attributes'];
+			// should we show extra ldap attributes home-directory and login-shell
+			$account['ldap_extra_attributes'] = $GLOBALS['egw_info']['server']['ldap_extra_attributes'] &&
+				get_class($GLOBALS['egw']->accounts) === 'accounts_ldap';
+
 			$readonlys = array();
 
 			if ($deny_edit)