From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Tue, 19 Aug 2014 12:08:35 -0400 Subject: [PATCH] Fix merge error that disabled contact drag'n'drop --- plugins/password/password.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/password/password.php b/plugins/password/password.php index 028a58d..806db05 100644 --- a/plugins/password/password.php +++ b/plugins/password/password.php @@ -164,7 +164,7 @@ // Log password change if ($rcmail->config->get('password_log')) { write_log('password', sprintf('Password changed for user %s (ID: %d) from %s', - $rcmail->user->get_username(), $rcmail->user->ID, rcmail_remote_ip())); + $rcmail->get_user_name(), $rcmail->user->ID, rcmail_remote_ip())); } } else { -- Gitblit v1.9.1