summaryrefslogtreecommitdiff
path: root/program/steps/addressbook
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-07-28 09:39:37 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-07-28 09:39:43 +0200
commitd4783319a086b09eb50ac6ad5da93eb1eeb771ca (patch)
tree3a461ae4317743bee81982d907a331c2f90c6ec7 /program/steps/addressbook
parent31c7ca08ee0e5c04103d0e3c047caeb710c0ae1e (diff)
Set 'compose_extwin' env property on every step; accept a list of URL parameters for the 'compose' command
Diffstat (limited to 'program/steps/addressbook')
-rw-r--r--program/steps/addressbook/func.inc1
-rw-r--r--program/steps/addressbook/show.inc1
2 files changed, 0 insertions, 2 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index f56e07169..d4c57cc9d 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -81,7 +81,6 @@ if (!$RCMAIL->action && !$OUTPUT->ajax_call) {
$OUTPUT->set_env('search_mods', $search_mods);
$OUTPUT->set_env('address_sources', $js_list);
$OUTPUT->set_env('writable_source', $writeable);
- $OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false));
$OUTPUT->set_pagetitle($RCMAIL->gettext('addressbook'));
$_SESSION['addressbooks_count'] = $count;
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index 4471ea658..8f357cd96 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -32,7 +32,6 @@ $SOURCE_ID = $source;
if ($cid && ($record = $CONTACTS->get_record($cid, true))) {
$OUTPUT->set_env('readonly', $CONTACTS->readonly || $record['readonly']);
$OUTPUT->set_env('cid', $record['ID']);
- $OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false));
}
// get address book name (for display)