From 0ea9ef224415745ad5b93a06106a7ecfdcd178bf Mon Sep 17 00:00:00 2001
From: Drake <drake@plainblack.com>
Date: Wed, 11 Oct 2006 18:54:32 +0000
Subject: [PATCH] Minor fixes to previous LDAPLink changes, including stripping
 \r properly and not transforming the recurseFilter multiple times.

---
 lib/WebGUI/LDAPLink.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/LDAPLink.pm b/lib/WebGUI/LDAPLink.pm
index 6f0945b8e..be3b747ba 100644
--- a/lib/WebGUI/LDAPLink.pm
+++ b/lib/WebGUI/LDAPLink.pm
@@ -268,9 +268,11 @@ sub recurseProperty {
 	my $recProperty = $_[3] || $property;
 	my $count = $_[4] || 0;
 	my $recurseFilter = $_[5] || $self->get->{ldapGlobalRecursiveFilter};
+	my $rfAlreadyTransformed = $_[6];
 	return unless($ldap && $base && $property);
 
-	if (length $recurseFilter) {
+	if (length $recurseFilter and not $rfAlreadyTransformed) {
+		$recurseFilter =~ tr/\r//d;
 		$recurseFilter =~ s/\A\n*//; $recurseFilter =~ s/\n*\z//;
 		$recurseFilter = (join '|', map{quotemeta} grep{/\S/} split /\n/, $recurseFilter);
 		$recurseFilter = length($recurseFilter)? qr/$recurseFilter/ : undef;
@@ -301,7 +303,7 @@ sub recurseProperty {
 		}
 		foreach my $prop (@{$properties}) {
 			next if $recurseFilter and $prop =~ m/$recurseFilter/i;
-			$self->recurseProperty($prop,$array,$property,$recProperty,$count,$recurseFilter);
+			$self->recurseProperty($prop,$array,$property,$recProperty,$count,$recurseFilter,1);
 		}
 	}
 }