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/steps/settings/identities.inc | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/program/steps/settings/identities.inc b/program/steps/settings/identities.inc index 26bd432..82a1841 100644 --- a/program/steps/settings/identities.inc +++ b/program/steps/settings/identities.inc @@ -33,11 +33,7 @@ if (!$attrib['id']) $attrib['id'] = 'rcmIdentityFrame'; - $attrib['name'] = $attrib['id']; - - $OUTPUT->set_env('contentframe', $attrib['name']); - - return html::iframe($attrib); + return $OUTPUT->frame($attrib, true); } $OUTPUT->add_handler('identityframe', 'rcmail_identity_frame'); -- Gitblit v1.9.1