diff --git a/lam/lib/export.inc b/lam/lib/export.inc
index 566b4326..efbcf212 100755
--- a/lam/lib/export.inc
+++ b/lam/lib/export.inc
@@ -8,7 +8,7 @@ $Id$
   Copyright (C) 2004  David Smith and phpLDAPadmin developers
   
   The original code was modified to fit for LDAP Account Manager by Roland Gruber.
-  Copyright (C) 2005 - 2006  Roland Gruber
+  Copyright (C) 2005 - 2010  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -343,7 +343,7 @@ class PlaLdapExporter extends PlaAbstractExporter{
       
       //get the attributes of the entry
       $attrs = @ldap_get_attributes($this->ds,$this->entry_id);
-      if( $attr = @ldap_first_attribute( $this->ds,$this->entry_id,$attrs ) ){
+      if( $attr = @ldap_first_attribute( $this->ds,$this->entry_id ) ){
 	
 	//iterate over the attributes
 	while( $attr ){
@@ -354,7 +354,7 @@ class PlaLdapExporter extends PlaAbstractExporter{
 	    $this->entry_array[$attr] = @ldap_get_values( $this->ds,$this->entry_id,$attr );
 	  }
 	  unset( $this->entry_array[$attr]['count'] );
-	  $attr = @ldap_next_attribute( $this->ds,$this->entry_id,$attrs );
+	  $attr = @ldap_next_attribute( $this->ds,$this->entry_id );
 	}// end while attr
 	
 	if(!$this->entry_id = @ldap_next_entry( $this->ds,$this->entry_id ) ){
diff --git a/lam/lib/tree.inc b/lam/lib/tree.inc
index cafcc3a9..4d7add90 100644
--- a/lam/lib/tree.inc
+++ b/lam/lib/tree.inc
@@ -8,7 +8,7 @@ $Id$
   Copyright (C) 2004  David Smith and phpLDAPadmin developers
   
   The original code was modified to fit for LDAP Account Manager by Roland Gruber.
-  Copyright (C) 2005 - 2006  Roland Gruber
+  Copyright (C) 2005 - 2010  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -1284,7 +1284,7 @@ function pla_ldap_search( $filter, $base_dn=null, $attrs=array(), $scope='sub',
 			$return[$dn]['dn'] = $dn;
 
 			//get the first attribute of the entry
-			if($attr = ldap_first_attribute($ds,$entry_id,$attrs))
+			if($attr = ldap_first_attribute($ds,$entry_id))
 
 				//iterate over the attributes
 				while($attr){
@@ -1301,7 +1301,7 @@ function pla_ldap_search( $filter, $base_dn=null, $attrs=array(), $scope='sub',
 					else
 						$return[$dn][$attr] = $values;
 
-					$attr = ldap_next_attribute($ds,$entry_id,$attrs);
+					$attr = ldap_next_attribute($ds,$entry_id);
 				}// end while attr
 
 			$entry_id = ldap_next_entry($ds,$entry_id);
diff --git a/lam/templates/tree/download_binary_attr.php b/lam/templates/tree/download_binary_attr.php
index bd3e1cfd..921ca0c6 100644
--- a/lam/templates/tree/download_binary_attr.php
+++ b/lam/templates/tree/download_binary_attr.php
@@ -74,7 +74,7 @@ if( ! $search ) {
 }
 $entry =  ldap_first_entry(     $ds, $search );
 $attrs =  ldap_get_attributes(  $ds, $entry );
-$attr =   ldap_first_attribute( $ds, $entry, $attrs );
+$attr =   ldap_first_attribute( $ds, $entry );
 $values = ldap_get_values_len(  $ds, $entry, $attr );
 $count = $values['count'];