From 0e1740e5a914250f06f52edb7de783ee945b8eaa Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sun, 20 Jun 2010 10:43:08 +0000
Subject: - Removed user_login/username_local/username_domain methods,   use
 rcube_user::get_username instead (#1486707)

git-svn-id: https://svn.roundcube.net/trunk@3775 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/password/drivers/ldap.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins/password/drivers/ldap.php')

diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index a8aba0f74..f86abd7f4 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -133,14 +133,15 @@ function search_userdn($rcmail)
  */
 function substitute_vars($str)
 {
+    $rcmail = rcmail::get_instance();
     $str = str_replace(array(
             '%login',
             '%name',
             '%domain',
         ), array(
             $_SESSION['username'],
-            password::username_local(),
-            password::username_domain(),
+            $rcmail->user->get_username('local'),
+            $rcmail->user->get_username('domain'),
         ), $str
     );
 
-- 
cgit v1.2.3