[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kolab-commits
Subject:    plugins/calendar plugins/libcalendaring plugins/tasklist
From:       Aleksander Machniak <machniak () kolabsys ! com>
Date:       2014-11-27 11:33:38
Message-ID: 20141127113338.85A796954A () app08 ! kolabsys ! com
[Download RAW message or body]

 plugins/calendar/calendar.php                      |    2 +-
 plugins/calendar/drivers/kolab/kolab_calendar.php  |    2 +-
 plugins/libcalendaring/lib/libcalendaring_itip.php |    4 ++--
 plugins/tasklist/tasklist.php                      |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6a7488f7311dc337270119ada1b8edeaa33c5054
Author: Aleksander Machniak <machniak@kolabsys.com>
Date:   Thu Nov 27 06:33:05 2014 -0500

    Performance: get_identity() -> list_emails(true)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index d7931ae..5a795fb 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -2654,7 +2654,7 @@ class calendar extends rcube_plugin
 
         // add attendee with this user's default identity if not listed
         if (!$reply_sender) {
-          $sender_identity = $this->rc->user->get_identity();
+          $sender_identity = $this->rc->user->list_emails(true);
           $event['attendees'][] = array(
             'name' => $sender_identity['name'],
             'email' => $sender_identity['email'],
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php \
b/plugins/calendar/drivers/kolab/kolab_calendar.php index 60d8b4c..2cc3c0b 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -679,7 +679,7 @@ class kolab_calendar extends kolab_storage_folder_api
     }
 
     // set current user as ORGANIZER
-    $identity = $this->cal->rc->user->get_identity();
+    $identity = $this->cal->rc->user->list_emails(true);
     if (empty($event['attendees']) && $identity['email'])
       $event['attendees'] = array(array('role' => 'ORGANIZER', 'name' => \
$identity['name'], 'email' => $identity['email']));  
diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php \
b/plugins/libcalendaring/lib/libcalendaring_itip.php index 2ba1547..c68330d 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -41,7 +41,7 @@ class libcalendaring_itip
         $this->domain = $domain;
 
         $hook = $this->rc->plugins->exec_hook('calendar_load_itip',
-            array('identity' => $this->rc->user->get_identity()));
+            array('identity' => $this->rc->user->list_emails(true)));
         $this->sender = $hook['identity'];
 
         $this->plugin->add_hook('message_before_send', array($this, \
'before_send_hook')); @@ -287,7 +287,7 @@ class libcalendaring_itip
         }
 
         $emails = $this->lib->get_user_emails();
-        $me = $this->rc->user->get_identity();
+        $me     = $this->rc->user->list_emails(true);
 
         // find/create the delegate attendee
         $delegate_attendee = array(
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index b39e78a..1c88429 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -1789,7 +1789,7 @@ class tasklist extends rcube_plugin
 
                 // add attendee with this user's default identity if not listed
                 if (!$reply_sender) {
-                    $sender_identity = $this->rc->user->get_identity();
+                    $sender_identity = $this->rc->user->list_emails(true);
                     $task['attendees'][] = array(
                         'name'   => $sender_identity['name'],
                         'email'  => $sender_identity['email'],


_______________________________________________
commits mailing list
commits@lists.kolab.org
https://lists.kolab.org/mailman/listinfo/commits


[prev in list] [next in list] [prev in thread] [next in thread]