From e48f8945b32ab5b67f1cdeb53a37d3d196e31e4d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 20 May 2016 05:19:01 -0400
Subject: [PATCH] Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
---
plugins/new_user_identity/new_user_identity.php | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 9764722..b905488 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -67,21 +67,27 @@
return $args;
}
- $identities = $this->rc->user->list_identities();
- $ldap_entry = $this->lookup_user_name(array('user' => $this->rc->user->data['username'],
- 'host' => $this->rc->user->data['mail_host']));
+ $identities = $this->rc->user->list_emails();
+ $ldap_entry = $this->lookup_user_name(array(
+ 'user' => $this->rc->user->data['username'],
+ 'host' => $this->rc->user->data['mail_host'],
+ ));
- foreach ($ldap_entry['email_list'] as $email) {
- foreach($identities as $identity) {
- if ($identity['email'] == $email ) {
+ foreach ((array) $ldap_entry['email_list'] as $email) {
+ foreach ($identities as $identity) {
+ if ($identity['email'] == $email) {
continue 2;
}
}
$plugin = $this->rc->plugins->exec_hook('identity_create', array(
- 'login' => true,
- 'record' => array('user_id' => $this->rc->user->ID, 'standard' => 0,
- 'email' => $email, 'name' => $ldap_entry['user_name']),
+ 'login' => true,
+ 'record' => array(
+ 'user_id' => $this->rc->user->ID,
+ 'standard' => 0,
+ 'email' => $email,
+ 'name' => $ldap_entry['user_name']
+ ),
));
if (!$plugin['abort'] && $plugin['record']['email']) {
--
Gitblit v1.9.1