From b0c70b3ca7127b9028e666f15e24261414d3caa0 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 03 Jun 2011 18:37:47 -0400
Subject: [PATCH] Use address_template config when adding a new address block (#1487944)
---
program/steps/addressbook/edit.inc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index cf6beba..96c4870 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -90,6 +90,10 @@
// add some labels to client
$RCMAIL->output->add_label('noemailwarning', 'nonamewarning');
+
+ // copy (parsed) address template to client
+ if (preg_match_all('/\{([a-z0-9]+)\}([^{]*)/i', $RCMAIL->config->get('address_template', ''), $templ, PREG_SET_ORDER))
+ $RCMAIL->output->set_env('address_template', $templ);
$i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
$t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 10;
--
Gitblit v1.9.1