diff --git a/htdocs/copy.php b/htdocs/copy.php
index 3dab63b..25bbd50 100644
--- a/htdocs/copy.php
+++ b/htdocs/copy.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/copy.php,v 1.44.2.3 2008/12/12 12:20:22 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/copy.php,v 1.44.2.4 2009/05/19 22:56:38 wurley Exp $
 
 /**
  * Copies a given object to create a new one.
@@ -144,7 +144,7 @@ function copy_dn($ldapserver_src,$ldapserver_dst,$dn_src,$dn_dst) {
 			echo '</small><br /><br />';
 			system_message(array(
 				'title'=>_('Failed to copy DN.').sprintf(' (%s)',$dn_dst),
-				'body'=>ldap_error_msg($ldapserver->error(),$ldapserver->errno()),
+				'body'=>ldap_error_msg($ldapserver_dst->error(),$ldapserver_dst->errno()),
 				'type'=>'error'));
 
 		} else {
diff --git a/htdocs/rdelete.php b/htdocs/rdelete.php
index fde4e9a..e44a6d5 100644
--- a/htdocs/rdelete.php
+++ b/htdocs/rdelete.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/rdelete.php,v 1.28.2.3 2008/12/12 12:20:22 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/rdelete.php,v 1.28.2.4 2009/06/20 07:14:20 wurley Exp $
 
 /**
  * Recursively deletes the specified DN and all of its children
@@ -51,7 +51,7 @@ if ($result) {
 
 function pla_rdelete($ldapserver,$dn) {
 	# we delete all children, not only the visible children in the tree
-	$children = $ldapserver->getContainerContents($dn);
+	$children = $ldapserver->getContainerContents($dn,0,'(objectclass=*)',LDAP_DEREF_NEVER);
 
 	if (! is_array($children) || count($children) == 0) {
 		printf('<span style="white-space: nowrap;">%s %s...',_('Deleting'),htmlspecialchars($dn));
diff --git a/lib/AJAXTree.php b/lib/AJAXTree.php
index 9c902a6..1a27b0b 100644
--- a/lib/AJAXTree.php
+++ b/lib/AJAXTree.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/AJAXTree.php,v 1.2.2.2 2008/12/12 06:46:15 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/AJAXTree.php,v 1.2.2.3 2009/06/28 05:30:12 wurley Exp $
 
 /**
  * @package phpLDAPadmin
@@ -13,7 +13,7 @@ class AJAXTree extends PLMTree {
 	 * @param $first_child is this the first child ?
 	 * @param $last_child is this the last child ?
 	 */
-	protected function draw_dn($dn,$level=0,$first_child=true,$last_child=true) {
+	protected function draw_dn($dn,$level,$first_child=true,$last_child=true) {
 		if (DEBUG_ENABLED)
 			debug_log('Entered with (%s,%s)',33,__FILE__,__LINE__,__METHOD__,$dn,$level);
 
diff --git a/lib/server_functions.php b/lib/server_functions.php
index 5140128..c3aaf5d 100644
--- a/lib/server_functions.php
+++ b/lib/server_functions.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.51.2.20 2009/03/20 07:48:45 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.51.2.21 2009/06/20 07:14:20 wurley Exp $
 
 /**
  * Classes and functions for LDAP server configuration and capability
@@ -1683,7 +1683,7 @@ class LDAPserver {
 	 * @return array An array of DN strings listing the immediate children of the specified entry.
 	 */
 
-	function getContainerContents($dn,$size_limit=0,$filter='(objectClass=*)',$deref=LDAP_DEREF_ALWAYS) {
+	function getContainerContents($dn,$size_limit=0,$filter='(objectClass=*)',$deref=LDAP_DEREF_NEVER) {
 		if (DEBUG_ENABLED)
 			debug_log('Entered with (%s,%s,%s,%s)',17,__FILE__,__LINE__,__METHOD__,$dn,$size_limit,$filter,$deref);
 
diff --git a/lib/template_functions.php b/lib/template_functions.php
index ac7a88b..666a4d0 100644
--- a/lib/template_functions.php
+++ b/lib/template_functions.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.43.2.9 2009/01/09 06:08:21 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.43.2.10 2009/06/12 01:36:39 wurley Exp $
 
 /**
  * Classes and functions for the template engine.ation and capability
@@ -774,7 +774,8 @@ class Templates {
 						$display = $args[3];
 
 						foreach ($matchall[1] as $arg)
-							$display = preg_replace('/%('.$arg.')(\|.+)?(\/[lU])?%/U',$values[$arg],$display);
+							if (isset($values[$arg]))
+								$display = preg_replace('/%('.$arg.')(\|.+)?(\/[lU])?%/U',$values[$arg],$display);
 
 						if (! isset($picklist[$values[$args[2]]])) {
 							$vals['_KEY:'.$values[$args[2]]] = $display;