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
---
program/include/rcmail.php | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 0ae5734..343f479 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -346,11 +346,24 @@
* These are stored in local config and user preferences.
*
* @param boolean True to sort the list alphabetically
+ * @param boolean True if only this user's responses shall be listed
* @return array List of the current user's stored responses
*/
- public function get_compose_responses($sorted = false)
+ public function get_compose_responses($sorted = false, $user_only = false)
{
$responses = array();
+
+ if (!$user_only) {
+ foreach ($this->config->get('compose_responses_static', array()) as $response) {
+ if (empty($response['key']))
+ $response['key'] = substr(md5($response['name']), 0, 16);
+ $response['static'] = true;
+ $response['class'] = 'readonly';
+ $k = $sorted ? '0000-' . strtolower($response['name']) : $response['key'];
+ $responses[$k] = $response;
+ }
+ }
+
foreach ($this->config->get('compose_responses', array()) as $response) {
if (empty($response['key']))
$response['key'] = substr(md5($response['name']), 0, 16);
--
Gitblit v1.9.1