From f4c8c3d31e8ac6ba4388b4caf1d6554332c83a8c Mon Sep 17 00:00:00 2001 From: Nic Bernstein Date: Tue, 19 Mar 2013 13:37:57 +1100 Subject: [PATCH] SF Bug #1008 getContainerPath doesn't properly traverse to baseDN and back & #1009 - return_ldap_hash should not return container object in result set --- lib/TemplateRender.php | 6 ++++++ lib/ds_ldap.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php index 249c7a1..22126b7 100644 --- a/lib/TemplateRender.php +++ b/lib/TemplateRender.php @@ -264,6 +264,9 @@ class TemplateRender extends PageRender { * * * arg 8 (for MultiList) * - size of displayed list (default: 10 lines) + * + * * arg 9 + * - if whether to include parent in sub query TRUE|FALSE */ case 'MultiList': case 'PickList': @@ -322,6 +325,9 @@ class TemplateRender extends PageRender { $vals = array(); foreach ($picklistvalues as $key => $values) { + if (! empty($args[9]) && $container == $key) + continue; + $display = $args[3]; foreach ($matchall[1] as $key => $arg) { diff --git a/lib/ds_ldap.php b/lib/ds_ldap.php index 6107552..fa84aed 100644 --- a/lib/ds_ldap.php +++ b/lib/ds_ldap.php @@ -939,7 +939,7 @@ class ldap extends DS { $dn = $this->getContainer($dn); if ($dn == $top) - break; + continue; } elseif($value) $dn = sprintf('%s,%s',$value,$dn);