Make result of rcmail::get_compose_responses() always an (indexed) array; add plugin hook for updating user prefs: 'preferences_update'

1 files changed, 3 insertions, 3 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 62f6254b5..f58235cbf 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -355,6 +355,7 @@ class rcmail extends rcube
    */
   public function get_compose_responses($sorted = false)
   {
+    $responses = array();
     foreach ($this->config->get('compose_responses', array()) as $response) {
       if (empty($response['key']))
         $response['key'] = substr(md5($response['name']), 0, 16);
@@ -362,13 +363,12 @@ class rcmail extends rcube
       $responses[$k] = $response;
     }
 
+    // sort list by name
     if ($sorted) {
-      // sort list by name
       ksort($responses, SORT_LOCALE_STRING);
-      return array_values($responses);
     }
 
-    return $responses;
+    return array_values($responses);
   }